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

rtc: rtc-wm831x: 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 bc2e9c0b

drivers/rtc/rtc-wm831x.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -436,7 +436,7 @@ static int wm831x_rtc_probe(struct platform_device *pdev) 




	device_init_wakeup(&pdev->dev, 1);

	device_init_wakeup(&pdev->dev, 1);





	wm831x_rtc->rtc = rtc_device_register("wm831x", &pdev->dev,

	wm831x_rtc->rtc = devm_rtc_device_register(&pdev->dev, "wm831x",

					      &wm831x_rtc_ops, THIS_MODULE);

					      &wm831x_rtc_ops, THIS_MODULE);

	if (IS_ERR(wm831x_rtc->rtc)) {

	if (IS_ERR(wm831x_rtc->rtc)) {

		ret = PTR_ERR(wm831x_rtc->rtc);

		ret = PTR_ERR(wm831x_rtc->rtc);
@@ -462,10 +462,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev) 




static int wm831x_rtc_remove(struct platform_device *pdev)

static int wm831x_rtc_remove(struct platform_device *pdev)

{

{

	struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev);



	rtc_device_unregister(wm831x_rtc->rtc);



	return 0;

	return 0;

}

}