diff options
| author | viresh kumar <[email protected]> | 2015-07-31 10:53:43 +0000 |
|---|---|---|
| committer | Alexandre Belloni <[email protected]> | 2015-09-05 11:19:09 +0000 |
| commit | e7cba884af366f49ab7b7f5157e690357addebba (patch) | |
| tree | a79d1fa54b0afa6a485e761d1fc1b90f30585df4 /drivers/rtc/interface.c | |
| parent | rtc: at91rm9200: sort headers alphabetically (diff) | |
| download | kernel-e7cba884af366f49ab7b7f5157e690357addebba.tar.gz kernel-e7cba884af366f49ab7b7f5157e690357addebba.zip | |
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 <[email protected]>
Acked-by: Hans Ulli Kroll <[email protected]>
Signed-off-by: Alexandre Belloni <[email protected]>
Diffstat (limited to 'drivers/rtc/interface.c')
| -rw-r--r-- | drivers/rtc/interface.c | 2 |
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) 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); |