diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-03 18:06:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:52 -0400 |
commit | a81de2076c32f2b02c454cfb16fdba63050c30b7 (patch) | |
tree | d09986b080a834ba4b9ab0dcf5a69104ff69c184 /drivers/rtc/rtc-rp5c01.c | |
parent | 7f1c2e824e10439ef716f2e0bda7609b0474d0f8 (diff) |
rtc: rtc-rp5c01: 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/rtc-rp5c01.c')
-rw-r--r-- | drivers/rtc/rtc-rp5c01.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/rtc/rtc-rp5c01.c b/drivers/rtc/rtc-rp5c01.c index 873c689f01c3..89d073679267 100644 --- a/drivers/rtc/rtc-rp5c01.c +++ b/drivers/rtc/rtc-rp5c01.c | |||
@@ -251,21 +251,15 @@ static int __init rp5c01_rtc_probe(struct platform_device *dev) | |||
251 | 251 | ||
252 | rtc = devm_rtc_device_register(&dev->dev, "rtc-rp5c01", &rp5c01_rtc_ops, | 252 | rtc = devm_rtc_device_register(&dev->dev, "rtc-rp5c01", &rp5c01_rtc_ops, |
253 | THIS_MODULE); | 253 | THIS_MODULE); |
254 | if (IS_ERR(rtc)) { | 254 | if (IS_ERR(rtc)) |
255 | error = PTR_ERR(rtc); | 255 | return PTR_ERR(rtc); |
256 | goto out; | ||
257 | } | ||
258 | priv->rtc = rtc; | 256 | priv->rtc = rtc; |
259 | 257 | ||
260 | error = sysfs_create_bin_file(&dev->dev.kobj, &priv->nvram_attr); | 258 | error = sysfs_create_bin_file(&dev->dev.kobj, &priv->nvram_attr); |
261 | if (error) | 259 | if (error) |
262 | goto out; | 260 | return error; |
263 | 261 | ||
264 | return 0; | 262 | return 0; |
265 | |||
266 | out: | ||
267 | platform_set_drvdata(dev, NULL); | ||
268 | return error; | ||
269 | } | 263 | } |
270 | 264 | ||
271 | static int __exit rp5c01_rtc_remove(struct platform_device *dev) | 265 | static int __exit rp5c01_rtc_remove(struct platform_device *dev) |