diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:19:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:31 -0400 |
commit | 92bb34ca4f3bea48973111d7364f90af2276b344 (patch) | |
tree | 0d5caf9245a585e90d0912cb22e3edabe05e0b24 /drivers/rtc/rtc-rx4581.c | |
parent | 3d7068c9d505baffc140f23465c5f998c2237b73 (diff) |
rtc: rtc-rx4581: use devm_rtc_device_register()
devm_rtc_device_register() is device managed and makes cleanup paths
simpler.
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-rx4581.c')
-rw-r--r-- | drivers/rtc/rtc-rx4581.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-rx4581.c b/drivers/rtc/rtc-rx4581.c index 599ec73ec886..d1b88dbc5c2c 100644 --- a/drivers/rtc/rtc-rx4581.c +++ b/drivers/rtc/rtc-rx4581.c | |||
@@ -273,8 +273,8 @@ static int rx4581_probe(struct spi_device *spi) | |||
273 | if (res != 0) | 273 | if (res != 0) |
274 | return res; | 274 | return res; |
275 | 275 | ||
276 | rtc = rtc_device_register("rx4581", | 276 | rtc = devm_rtc_device_register(&spi->dev, "rx4581", |
277 | &spi->dev, &rx4581_rtc_ops, THIS_MODULE); | 277 | &rx4581_rtc_ops, THIS_MODULE); |
278 | if (IS_ERR(rtc)) | 278 | if (IS_ERR(rtc)) |
279 | return PTR_ERR(rtc); | 279 | return PTR_ERR(rtc); |
280 | 280 | ||
@@ -284,9 +284,6 @@ static int rx4581_probe(struct spi_device *spi) | |||
284 | 284 | ||
285 | static int rx4581_remove(struct spi_device *spi) | 285 | static int rx4581_remove(struct spi_device *spi) |
286 | { | 286 | { |
287 | struct rtc_device *rtc = dev_get_drvdata(&spi->dev); | ||
288 | |||
289 | rtc_device_unregister(rtc); | ||
290 | return 0; | 287 | return 0; |
291 | } | 288 | } |
292 | 289 | ||