aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-05-06 00:22:41 -0400
committerAnton Vorontsov <anton@enomsg.org>2013-06-06 20:14:02 -0400
commit8ff3fb2902dd5d3c953f907906a413b18d9d150a (patch)
tree47ad89c45615f4e0f62e1d0b7050d9fc16caec95 /drivers/power
parent6fe6a40a83716166ac55e7f60053f59563d53878 (diff)
jz4740-battery: Remove unnecessary platform_set_drvdata()
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>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/jz4740-battery.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index c675553d4647..d9686aa9270a 100644
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -292,7 +292,7 @@ static int jz_battery_probe(struct platform_device *pdev)
292 jz_battery); 292 jz_battery);
293 if (ret) { 293 if (ret) {
294 dev_err(&pdev->dev, "Failed to request irq %d\n", ret); 294 dev_err(&pdev->dev, "Failed to request irq %d\n", ret);
295 goto err; 295 return ret;
296 } 296 }
297 disable_irq(jz_battery->irq); 297 disable_irq(jz_battery->irq);
298 298
@@ -349,8 +349,6 @@ err_free_gpio:
349 gpio_free(jz_battery->pdata->gpio_charge); 349 gpio_free(jz_battery->pdata->gpio_charge);
350err_free_irq: 350err_free_irq:
351 free_irq(jz_battery->irq, jz_battery); 351 free_irq(jz_battery->irq, jz_battery);
352err:
353 platform_set_drvdata(pdev, NULL);
354 return ret; 352 return ret;
355} 353}
356 354