aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc/interface.c
diff options
context:
space:
mode:
authorviresh kumar <viresh.kumar@linaro.org>2015-07-31 06:53:43 -0400
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-09-05 07:19:09 -0400
commite7cba884af366f49ab7b7f5157e690357addebba (patch)
treea79d1fa54b0afa6a485e761d1fc1b90f30585df4 /drivers/rtc/interface.c
parent74000eb14a173f427240b90363580c686a675ddf (diff)
rtc: Drop (un)likely before IS_ERR(_OR_NULL)
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>
Diffstat (limited to 'drivers/rtc/interface.c')
-rw-r--r--drivers/rtc/interface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 11b639067312..5836751b8203 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -564,7 +564,7 @@ enum hrtimer_restart rtc_pie_update_irq(struct hrtimer *timer)
564void rtc_update_irq(struct rtc_device *rtc, 564void rtc_update_irq(struct rtc_device *rtc,
565 unsigned long num, unsigned long events) 565 unsigned long num, unsigned long events)
566{ 566{
567 if (unlikely(IS_ERR_OR_NULL(rtc))) 567 if (IS_ERR_OR_NULL(rtc))
568 return; 568 return;
569 569
570 pm_stay_awake(rtc->dev.parent); 570 pm_stay_awake(rtc->dev.parent);