diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:19:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:26 -0400 |
commit | ac4e7d49e99221a7892747d2ac432370056b353a (patch) | |
tree | 070d864576b5093ff5a88992864d420abe70f69b /drivers/rtc | |
parent | f56950ec3a8dc093db724bf1c1611a12c85fb260 (diff) |
rtc: rtc-max8907: 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')
-rw-r--r-- | drivers/rtc/rtc-max8907.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-max8907.c b/drivers/rtc/rtc-max8907.c index 31ca8faf9f05..9d62cdb83d11 100644 --- a/drivers/rtc/rtc-max8907.c +++ b/drivers/rtc/rtc-max8907.c | |||
@@ -190,7 +190,7 @@ static int max8907_rtc_probe(struct platform_device *pdev) | |||
190 | rtc->max8907 = max8907; | 190 | rtc->max8907 = max8907; |
191 | rtc->regmap = max8907->regmap_rtc; | 191 | rtc->regmap = max8907->regmap_rtc; |
192 | 192 | ||
193 | rtc->rtc_dev = rtc_device_register("max8907-rtc", &pdev->dev, | 193 | rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, "max8907-rtc", |
194 | &max8907_rtc_ops, THIS_MODULE); | 194 | &max8907_rtc_ops, THIS_MODULE); |
195 | if (IS_ERR(rtc->rtc_dev)) { | 195 | if (IS_ERR(rtc->rtc_dev)) { |
196 | ret = PTR_ERR(rtc->rtc_dev); | 196 | ret = PTR_ERR(rtc->rtc_dev); |
@@ -217,16 +217,11 @@ static int max8907_rtc_probe(struct platform_device *pdev) | |||
217 | return 0; | 217 | return 0; |
218 | 218 | ||
219 | err_unregister: | 219 | err_unregister: |
220 | rtc_device_unregister(rtc->rtc_dev); | ||
221 | return ret; | 220 | return ret; |
222 | } | 221 | } |
223 | 222 | ||
224 | static int max8907_rtc_remove(struct platform_device *pdev) | 223 | static int max8907_rtc_remove(struct platform_device *pdev) |
225 | { | 224 | { |
226 | struct max8907_rtc *rtc = platform_get_drvdata(pdev); | ||
227 | |||
228 | rtc_device_unregister(rtc->rtc_dev); | ||
229 | |||
230 | return 0; | 225 | return 0; |
231 | } | 226 | } |
232 | 227 | ||