Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

rtc: rtc-s3c: remove unnecessary platform_set_drvdata() 



The driver core clears the driver data to NULL after device_release or
on probe failure, since commit 0998d063 ("device-core: Ensure drvdata
= NULL when no driver is bound").  Thus, it is not needed to manually
clear the device driver data to NULL.

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 253262a5

drivers/rtc/rtc-s3c.c

+2 −7
Original line number Diff line number Diff line
@@ -421,8 +421,6 @@ static void s3c_rtc_enable(struct platform_device *pdev, int en) 


static int s3c_rtc_remove(struct platform_device *dev)

{

	platform_set_drvdata(dev, NULL);



	s3c_rtc_setaie(&dev->dev, 0);



	clk_unprepare(rtc_clk);
@@ -549,23 +547,20 @@ static int s3c_rtc_probe(struct platform_device *pdev) 
			  0,  "s3c2410-rtc alarm", rtc);

	if (ret) {

		dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);

		goto err_alarm_irq;

		goto err_nortc;

	}



	ret = devm_request_irq(&pdev->dev, s3c_rtc_tickno, s3c_rtc_tickirq,

			  0,  "s3c2410-rtc tick", rtc);

	if (ret) {

		dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);

		goto err_alarm_irq;

		goto err_nortc;

	}



	clk_disable(rtc_clk);



	return 0;



 err_alarm_irq:

	platform_set_drvdata(pdev, NULL);



 err_nortc:

	s3c_rtc_enable(pdev, 0);

	clk_disable_unprepare(rtc_clk);