Skip to content

Commit

Permalink
rtc: Drop (un)likely before IS_ERR(_OR_NULL)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
viresh kumar authored and Alexandre Belloni committed Sep 5, 2015
1 parent 74000eb commit e7cba88
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/rtc/interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/rtc/rtc-bfin.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion drivers/rtc/rtc-gemini.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e7cba88

Please sign in to comment.