jz4740-battery: Remove unnecessary platform_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Mon, 6 May 2013 04:22:41 +0000 (13:22 +0900)
committerAnton Vorontsov <anton@enomsg.org>
Fri, 7 Jun 2013 00:14:02 +0000 (17:14 -0700)
The driver core clears the driver data to NULL after device_release or on
probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is
not needed to manually clear the device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
drivers/power/jz4740-battery.c

index c675553..d9686aa 100644 (file)
@@ -292,7 +292,7 @@ static int jz_battery_probe(struct platform_device *pdev)
                        jz_battery);
        if (ret) {
                dev_err(&pdev->dev, "Failed to request irq %d\n", ret);
-               goto err;
+               return ret;
        }
        disable_irq(jz_battery->irq);
 
@@ -349,8 +349,6 @@ err_free_gpio:
                gpio_free(jz_battery->pdata->gpio_charge);
 err_free_irq:
        free_irq(jz_battery->irq, jz_battery);
-err:
-       platform_set_drvdata(pdev, NULL);
        return ret;
 }