aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-07-03 18:06:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 19:07:51 -0400
commit4802f224a50d841786f17a1d27dd48dc149a1e33 (patch)
treed0d28635a029bc695c7d79f0cfb71c8a88f7fc04 /drivers/rtc
parent28e1de09421b0e21dffbf2186b5ef14c1c8e033c (diff)
rtc: rtc-max8998: remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d063100 ("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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-max8998.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-max8998.c b/drivers/rtc/rtc-max8998.c
index d5af7baa48b5..738eecef4d90 100644
--- a/drivers/rtc/rtc-max8998.c
+++ b/drivers/rtc/rtc-max8998.c
@@ -274,7 +274,7 @@ static int max8998_rtc_probe(struct platform_device *pdev)
274 if (IS_ERR(info->rtc_dev)) { 274 if (IS_ERR(info->rtc_dev)) {
275 ret = PTR_ERR(info->rtc_dev); 275 ret = PTR_ERR(info->rtc_dev);
276 dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret); 276 dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
277 goto out_rtc; 277 return ret;
278 } 278 }
279 279
280 ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL, 280 ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
@@ -292,10 +292,6 @@ static int max8998_rtc_probe(struct platform_device *pdev)
292 } 292 }
293 293
294 return 0; 294 return 0;
295
296out_rtc:
297 platform_set_drvdata(pdev, NULL);
298 return ret;
299} 295}
300 296
301static int max8998_rtc_remove(struct platform_device *pdev) 297static int max8998_rtc_remove(struct platform_device *pdev)