summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-07-03 15:06:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:51 -0700
commit4802f224a50d841786f17a1d27dd48dc149a1e33 (patch)
treed0d28635a029bc695c7d79f0cfb71c8a88f7fc04
parent28e1de09421b0e21dffbf2186b5ef14c1c8e033c (diff)
downloadlinux-stable-4802f224a50d841786f17a1d27dd48dc149a1e33.tar.gz
linux-stable-4802f224a50d841786f17a1d27dd48dc149a1e33.tar.bz2
linux-stable-4802f224a50d841786f17a1d27dd48dc149a1e33.zip
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>
-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)
if (IS_ERR(info->rtc_dev)) {
ret = PTR_ERR(info->rtc_dev);
dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
- goto out_rtc;
+ return ret;
}
ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
@@ -292,10 +292,6 @@ static int max8998_rtc_probe(struct platform_device *pdev)
}
return 0;
-
-out_rtc:
- platform_set_drvdata(pdev, NULL);
- return ret;
}
static int max8998_rtc_remove(struct platform_device *pdev)