summaryrefslogtreecommitdiff
path: root/drivers/rtc/rtc-gemini.c
diff options
context:
space:
mode:
authorviresh kumar <viresh.kumar@linaro.org>2015-07-31 10:53:43 (GMT)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-09-05 11:19:09 (GMT)
commite7cba884af366f49ab7b7f5157e690357addebba (patch)
treea79d1fa54b0afa6a485e761d1fc1b90f30585df4 /drivers/rtc/rtc-gemini.c
parent74000eb14a173f427240b90363580c686a675ddf (diff)
downloadlinux-e7cba884af366f49ab7b7f5157e690357addebba.tar.xz
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/rtc-gemini.c')
-rw-r--r--drivers/rtc/rtc-gemini.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-gemini.c b/drivers/rtc/rtc-gemini.c
index 35f4486..2fed93e 100644
--- a/drivers/rtc/rtc-gemini.c
+++ b/drivers/rtc/rtc-gemini.c
@@ -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;