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

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

rtc: rtc-stmp3xxx: 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 1cc62235

drivers/rtc/rtc-stmp3xxx.c

+3 −10
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ static int stmp3xxx_rtc_remove(struct platform_device *pdev) 


	writel(STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,

			rtc_data->io + STMP3XXX_RTC_CTRL_CLR);

	platform_set_drvdata(pdev, NULL);



	return 0;

}
@@ -274,25 +273,19 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev) 


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

				&stmp3xxx_rtc_ops, THIS_MODULE);

	if (IS_ERR(rtc_data->rtc)) {

		err = PTR_ERR(rtc_data->rtc);

		goto out;

	}

	if (IS_ERR(rtc_data->rtc))

		return PTR_ERR(rtc_data->rtc);



	err = devm_request_irq(&pdev->dev, rtc_data->irq_alarm,

			stmp3xxx_rtc_interrupt, 0, "RTC alarm", &pdev->dev);

	if (err) {

		dev_err(&pdev->dev, "Cannot claim IRQ%d\n",

			rtc_data->irq_alarm);

		goto out;

		return err;

	}



	stmp3xxx_wdt_register(pdev);

	return 0;



out:

	platform_set_drvdata(pdev, NULL);

	return err;

}



#ifdef CONFIG_PM_SLEEP