rtc: rtc-tps65910: 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:
committed by
Linus Torvalds
parent
77cf81b39f
commit
97868b3225
@@ -276,7 +276,7 @@ static int tps65910_rtc_probe(struct platform_device *pdev)
|
|||||||
tps_rtc->irq = irq;
|
tps_rtc->irq = irq;
|
||||||
device_set_wakeup_capable(&pdev->dev, 1);
|
device_set_wakeup_capable(&pdev->dev, 1);
|
||||||
|
|
||||||
tps_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
|
tps_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
|
||||||
&tps65910_rtc_ops, THIS_MODULE);
|
&tps65910_rtc_ops, THIS_MODULE);
|
||||||
if (IS_ERR(tps_rtc->rtc)) {
|
if (IS_ERR(tps_rtc->rtc)) {
|
||||||
ret = PTR_ERR(tps_rtc->rtc);
|
ret = PTR_ERR(tps_rtc->rtc);
|
||||||
@@ -295,12 +295,8 @@ static int tps65910_rtc_probe(struct platform_device *pdev)
|
|||||||
*/
|
*/
|
||||||
static int tps65910_rtc_remove(struct platform_device *pdev)
|
static int tps65910_rtc_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
/* leave rtc running, but disable irqs */
|
|
||||||
struct tps65910_rtc *tps_rtc = platform_get_drvdata(pdev);
|
|
||||||
|
|
||||||
tps65910_rtc_alarm_irq_enable(&pdev->dev, 0);
|
tps65910_rtc_alarm_irq_enable(&pdev->dev, 0);
|
||||||
|
|
||||||
rtc_device_unregister(tps_rtc->rtc);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user