rtc: rtc-tps80031: 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
97868b3225
commit
faa43af9bc
|
@ -277,7 +277,7 @@ static int tps80031_rtc_probe(struct platform_device *pdev)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
|
rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
|
||||||
&tps80031_rtc_ops, THIS_MODULE);
|
&tps80031_rtc_ops, THIS_MODULE);
|
||||||
if (IS_ERR(rtc->rtc)) {
|
if (IS_ERR(rtc->rtc)) {
|
||||||
ret = PTR_ERR(rtc->rtc);
|
ret = PTR_ERR(rtc->rtc);
|
||||||
|
@ -292,7 +292,6 @@ static int tps80031_rtc_probe(struct platform_device *pdev)
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(&pdev->dev, "request IRQ:%d failed, err = %d\n",
|
dev_err(&pdev->dev, "request IRQ:%d failed, err = %d\n",
|
||||||
rtc->irq, ret);
|
rtc->irq, ret);
|
||||||
rtc_device_unregister(rtc->rtc);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
device_set_wakeup_capable(&pdev->dev, 1);
|
device_set_wakeup_capable(&pdev->dev, 1);
|
||||||
|
@ -301,9 +300,6 @@ static int tps80031_rtc_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
static int tps80031_rtc_remove(struct platform_device *pdev)
|
static int tps80031_rtc_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct tps80031_rtc *rtc = platform_get_drvdata(pdev);
|
|
||||||
|
|
||||||
rtc_device_unregister(rtc->rtc);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue