Commit f650e657 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

rtc: rtc-ds1511: use devm_rtc_device_register() 



devm_rtc_device_register() is device managed and makes cleanup
paths simpler.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8ae236b8

drivers/rtc/rtc-ds1511.c

+3 −5
Original line number Diff line number Diff line
@@ -538,15 +538,14 @@ static int ds1511_rtc_probe(struct platform_device *pdev) 
		}

	}



	rtc = rtc_device_register(pdev->name, &pdev->dev, &ds1511_rtc_ops,

	rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &ds1511_rtc_ops,

					THIS_MODULE);

	if (IS_ERR(rtc))

		return PTR_ERR(rtc);

	pdata->rtc = rtc;



	ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr);

	if (ret)

		rtc_device_unregister(pdata->rtc);



	return ret;

}
@@ -555,7 +554,6 @@ static int ds1511_rtc_remove(struct platform_device *pdev) 
	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);



	sysfs_remove_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr);

	rtc_device_unregister(pdata->rtc);

	if (pdata->irq > 0) {

		/*

		 * disable the alarm interrupt