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

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

rtc: rtc-pcap: 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 6d4a38cb

drivers/rtc/rtc-pcap.c

+4 −9
Original line number Diff line number Diff line
@@ -156,10 +156,8 @@ static int __init pcap_rtc_probe(struct platform_device *pdev) 


	pcap_rtc->rtc = devm_rtc_device_register(&pdev->dev, "pcap",

					&pcap_rtc_ops, THIS_MODULE);

	if (IS_ERR(pcap_rtc->rtc)) {

		err = PTR_ERR(pcap_rtc->rtc);

		goto fail;

	}

	if (IS_ERR(pcap_rtc->rtc))

		return PTR_ERR(pcap_rtc->rtc);



	timer_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_1HZ);

	alarm_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_TODA);
@@ -167,17 +165,14 @@ static int __init pcap_rtc_probe(struct platform_device *pdev) 
	err = devm_request_irq(&pdev->dev, timer_irq, pcap_rtc_irq, 0,

				"RTC Timer", pcap_rtc);

	if (err)

		goto fail;

		return err;



	err = devm_request_irq(&pdev->dev, alarm_irq, pcap_rtc_irq, 0,

				"RTC Alarm", pcap_rtc);

	if (err)

		goto fail;

		return err;



	return 0;

fail:

	platform_set_drvdata(pdev, NULL);

	return err;

}



static int __exit pcap_rtc_remove(struct platform_device *pdev)