diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-03 18:06:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:51 -0400 |
commit | 66600bbef9c74c49b2a020a04897af86202b8d15 (patch) | |
tree | dac349a2b1e78369b80a34eb333a3a570ccb9835 /drivers/rtc/rtc-sa1100.c | |
parent | fb9b525e7930822e6fbe6db1cce931686545410a (diff) |
rtc: rtc-sa1100: 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-sa1100.c')
-rw-r--r-- | drivers/rtc/rtc-sa1100.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 00605601dbf7..0f7adeb1944a 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
@@ -249,7 +249,7 @@ static int sa1100_rtc_probe(struct platform_device *pdev) | |||
249 | 249 | ||
250 | ret = clk_prepare_enable(info->clk); | 250 | ret = clk_prepare_enable(info->clk); |
251 | if (ret) | 251 | if (ret) |
252 | goto err_enable_clk; | 252 | return ret; |
253 | /* | 253 | /* |
254 | * According to the manual we should be able to let RTTR be zero | 254 | * According to the manual we should be able to let RTTR be zero |
255 | * and then a default diviser for a 32.768KHz clock is used. | 255 | * and then a default diviser for a 32.768KHz clock is used. |
@@ -303,8 +303,6 @@ static int sa1100_rtc_probe(struct platform_device *pdev) | |||
303 | return 0; | 303 | return 0; |
304 | err_dev: | 304 | err_dev: |
305 | clk_disable_unprepare(info->clk); | 305 | clk_disable_unprepare(info->clk); |
306 | err_enable_clk: | ||
307 | platform_set_drvdata(pdev, NULL); | ||
308 | return ret; | 306 | return ret; |
309 | } | 307 | } |
310 | 308 | ||
@@ -312,10 +310,8 @@ static int sa1100_rtc_remove(struct platform_device *pdev) | |||
312 | { | 310 | { |
313 | struct sa1100_rtc *info = platform_get_drvdata(pdev); | 311 | struct sa1100_rtc *info = platform_get_drvdata(pdev); |
314 | 312 | ||
315 | if (info) { | 313 | if (info) |
316 | clk_disable_unprepare(info->clk); | 314 | clk_disable_unprepare(info->clk); |
317 | platform_set_drvdata(pdev, NULL); | ||
318 | } | ||
319 | 315 | ||
320 | return 0; | 316 | return 0; |
321 | } | 317 | } |