diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:19:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:29 -0400 |
commit | 2c0011dd2fb09d6bcfc0ff4524131a08b0006e47 (patch) | |
tree | 2c7ddb721b370c248d1df69d9c62abe81445bcea /drivers/rtc/rtc-ds3234.c | |
parent | aac8703c1313c4b7e1a4cf82bcfe62ab0ad79b0d (diff) |
rtc: rtc-ds3234: 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-ds3234.c')
-rw-r--r-- | drivers/rtc/rtc-ds3234.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c index 7a4495ef1c39..a66efd49430e 100644 --- a/drivers/rtc/rtc-ds3234.c +++ b/drivers/rtc/rtc-ds3234.c | |||
@@ -146,8 +146,8 @@ static int ds3234_probe(struct spi_device *spi) | |||
146 | ds3234_get_reg(&spi->dev, DS3234_REG_CONT_STAT, &tmp); | 146 | ds3234_get_reg(&spi->dev, DS3234_REG_CONT_STAT, &tmp); |
147 | dev_info(&spi->dev, "Ctrl/Stat Reg: 0x%02x\n", tmp); | 147 | dev_info(&spi->dev, "Ctrl/Stat Reg: 0x%02x\n", tmp); |
148 | 148 | ||
149 | rtc = rtc_device_register("ds3234", | 149 | rtc = devm_rtc_device_register(&spi->dev, "ds3234", |
150 | &spi->dev, &ds3234_rtc_ops, THIS_MODULE); | 150 | &ds3234_rtc_ops, THIS_MODULE); |
151 | if (IS_ERR(rtc)) | 151 | if (IS_ERR(rtc)) |
152 | return PTR_ERR(rtc); | 152 | return PTR_ERR(rtc); |
153 | 153 | ||
@@ -158,9 +158,6 @@ static int ds3234_probe(struct spi_device *spi) | |||
158 | 158 | ||
159 | static int ds3234_remove(struct spi_device *spi) | 159 | static int ds3234_remove(struct spi_device *spi) |
160 | { | 160 | { |
161 | struct rtc_device *rtc = spi_get_drvdata(spi); | ||
162 | |||
163 | rtc_device_unregister(rtc); | ||
164 | return 0; | 161 | return 0; |
165 | } | 162 | } |
166 | 163 | ||