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>
This commit is contained in:
parent
f56950ec3a
commit
ac4e7d49e9
@ -190,7 +190,7 @@ static int max8907_rtc_probe(struct platform_device *pdev)
|
|||||||
rtc->max8907 = max8907;
|
rtc->max8907 = max8907;
|
||||||
rtc->regmap = max8907->regmap_rtc;
|
rtc->regmap = max8907->regmap_rtc;
|
||||||
|
|
||||||
rtc->rtc_dev = rtc_device_register("max8907-rtc", &pdev->dev,
|
rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, "max8907-rtc",
|
||||||
&max8907_rtc_ops, THIS_MODULE);
|
&max8907_rtc_ops, THIS_MODULE);
|
||||||
if (IS_ERR(rtc->rtc_dev)) {
|
if (IS_ERR(rtc->rtc_dev)) {
|
||||||
ret = PTR_ERR(rtc->rtc_dev);
|
ret = PTR_ERR(rtc->rtc_dev);
|
||||||
@ -217,16 +217,11 @@ static int max8907_rtc_probe(struct platform_device *pdev)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_unregister:
|
err_unregister:
|
||||||
rtc_device_unregister(rtc->rtc_dev);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int max8907_rtc_remove(struct platform_device *pdev)
|
static int max8907_rtc_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct max8907_rtc *rtc = platform_get_drvdata(pdev);
|
|
||||||
|
|
||||||
rtc_device_unregister(rtc->rtc_dev);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user