rtc: Drop (un)likely before IS_ERR(_OR_NULL) (e7cba884) · Commits · 戴 / test

IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there is no need to do that again from its callers. Drop it. gemini driver was using likely() for a failure case while the rtc driver is getting registered. That looks wrong and it should really be unlikely. But because we are killing all the unlikely() flags, lets kill that too. Signed-off-by:

Viresh Kumar <viresh.kumar@linaro.org> Acked-by:

Hans Ulli Kroll <ulli.kroll@googlemail.com> Signed-off-by:

Alexandre Belloni <alexandre.belloni@free-electrons.com>

drivers/rtc/interface.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -564,7 +564,7 @@ enum hrtimer_restart rtc_pie_update_irq(struct hrtimer *timer)
		void rtc_update_irq(struct rtc_device *rtc,
		unsigned long num, unsigned long events)
		{
		if (unlikely(IS_ERR_OR_NULL(rtc)))
		if (IS_ERR_OR_NULL(rtc))
		return;

		pm_stay_awake(rtc->dev.parent);

drivers/rtc/rtc-bfin.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -361,7 +361,7 @@ static int bfin_rtc_probe(struct platform_device *pdev)
		/* Register our RTC with the RTC framework */
		rtc->rtc_dev = devm_rtc_device_register(dev, pdev->name, &bfin_rtc_ops,
		THIS_MODULE);
		if (unlikely(IS_ERR(rtc->rtc_dev)))
		if (IS_ERR(rtc->rtc_dev))
		return PTR_ERR(rtc->rtc_dev);

		/* Grab the IRQ and init the hardware */

drivers/rtc/rtc-gemini.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ static int gemini_rtc_probe(struct platform_device *pdev)

		rtc->rtc_dev = rtc_device_register(pdev->name, dev,
		&gemini_rtc_ops, THIS_MODULE);
		if (likely(IS_ERR(rtc->rtc_dev)))
		if (IS_ERR(rtc->rtc_dev))
		return PTR_ERR(rtc->rtc_dev);

		return 0;

Admin message