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

rtc: rtc-stk17ta8: 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 246b1a99

drivers/rtc/rtc-stk17ta8.c

+2 −4
Original line number Diff line number Diff line
@@ -336,14 +336,13 @@ static int stk17ta8_rtc_probe(struct platform_device *pdev) 
		}

	}



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

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

				  &stk17ta8_rtc_ops, THIS_MODULE);

	if (IS_ERR(pdata->rtc))

		return PTR_ERR(pdata->rtc);



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

	if (ret)

		rtc_device_unregister(pdata->rtc);



	return ret;

}
@@ -352,7 +351,6 @@ static int stk17ta8_rtc_remove(struct platform_device *pdev) 
	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);



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

	rtc_device_unregister(pdata->rtc);

	if (pdata->irq > 0)

		writeb(0, pdata->ioaddr + RTC_INTERRUPTS);

	return 0;