diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-03 18:06:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:51 -0400 |
commit | e3aa7526fca757312732f88cd16f7a73a496b80d (patch) | |
tree | a420768af8e9682a5f1b3436386e59888eb2dcc8 /drivers/rtc | |
parent | d8f447877b1cd40267a66c6d9fcd11464c859346 (diff) |
rtc: rtc-msm6242: 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-msm6242.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/rtc/rtc-msm6242.c b/drivers/rtc/rtc-msm6242.c index f0e9893ae7be..c014fa2ee5e9 100644 --- a/drivers/rtc/rtc-msm6242.c +++ b/drivers/rtc/rtc-msm6242.c | |||
@@ -199,7 +199,6 @@ static int __init msm6242_rtc_probe(struct platform_device *pdev) | |||
199 | struct resource *res; | 199 | struct resource *res; |
200 | struct msm6242_priv *priv; | 200 | struct msm6242_priv *priv; |
201 | struct rtc_device *rtc; | 201 | struct rtc_device *rtc; |
202 | int error; | ||
203 | 202 | ||
204 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 203 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
205 | if (!res) | 204 | if (!res) |
@@ -216,17 +215,11 @@ static int __init msm6242_rtc_probe(struct platform_device *pdev) | |||
216 | 215 | ||
217 | rtc = devm_rtc_device_register(&pdev->dev, "rtc-msm6242", | 216 | rtc = devm_rtc_device_register(&pdev->dev, "rtc-msm6242", |
218 | &msm6242_rtc_ops, THIS_MODULE); | 217 | &msm6242_rtc_ops, THIS_MODULE); |
219 | if (IS_ERR(rtc)) { | 218 | if (IS_ERR(rtc)) |
220 | error = PTR_ERR(rtc); | 219 | return PTR_ERR(rtc); |
221 | goto out_unmap; | ||
222 | } | ||
223 | 220 | ||
224 | priv->rtc = rtc; | 221 | priv->rtc = rtc; |
225 | return 0; | 222 | return 0; |
226 | |||
227 | out_unmap: | ||
228 | platform_set_drvdata(pdev, NULL); | ||
229 | return error; | ||
230 | } | 223 | } |
231 | 224 | ||
232 | static int __exit msm6242_rtc_remove(struct platform_device *pdev) | 225 | static int __exit msm6242_rtc_remove(struct platform_device *pdev) |