dmaengine: pl330: Remove non-NULL check for pl330_submit_req parameters

[deliverable/linux.git] / drivers / extcon / extcon-max8997.c

diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index d9f7f1baaa030f50e8568caa7724194dbc8ea854..75e501c980054d80bb5be4d0a8b346bd8fe5cec0 100644 (file)
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -661,10 +661,8 @@ static int max8997_muic_probe(struct platform_device *pdev)
 
        info = devm_kzalloc(&pdev->dev, sizeof(struct max8997_muic_info),
                            GFP_KERNEL);
-       if (!info) {
-               dev_err(&pdev->dev, "failed to allocate memory\n");
+       if (!info)
                return -ENOMEM;
-       }
 
        info->dev = &pdev->dev;
        info->muic = max8997->muic;
@@ -706,7 +704,6 @@ static int max8997_muic_probe(struct platform_device *pdev)
                goto err_irq;
        }
        info->edev->name = DEV_NAME;
-       info->edev->dev.parent = &pdev->dev;
 
        ret = devm_extcon_dev_register(&pdev->dev, info->edev);
        if (ret) {