[PATCH] drivers/rtc: fix compile warning introduced by 1s reboot fix

[PATCH] drivers/rtc: fix compile warning introduced by 1s reboot fix

[Paul Gortmaker]

We currently see this warning:

drivers/rtc/rtc-cmos.c:851:7: warning: unused variable 'err'

introduced by commit 7b4a008088a28ea936fffbbfa770d0184468a0ce ("rtc-cmos:
Cancel alarm timer if alarm time is equal to now+1 seconds").

Presumably some WIP version of the commit was doing error checking
but then the variable was not removed prior to submission, and the
pending commits weren't on kernel.org for kbuild bot to spot the new
warning created.

Cc: Adrian Huang <ahuang12@lenovo.com>
Cc: Egbert Eich <eich@suse.de>
Cc: Diego Ercolani <diego.ercolani@gmail.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: rtc-linux@googlegroups.com
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[Note: patch is against linux-next, so if the rtc tree is rebased,
 then the above commit ID reference will be stale.  Feel free to
 adjust the commit log appropriately, if need be, or even squash
 this into the original offending patch, if rebasing back that far.
 Also ensuring your tree is on kernel.org will allow kbuild bot
 to spot these on your behalf via the zero day builds.]

 drivers/rtc/rtc-cmos.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 916bd1f555e5..c2e90c62a59c 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -848,7 +848,6 @@ static int cmos_aie_poweroff(struct device *dev)
 	 */
 	if (cmos->alarm_expires == t_now + 1) {
 		struct rtc_wkalrm alarm;
-		int err;
 
 		/* Cancel the AIE timer by configuring the past time. */
 		rtc_time64_to_tm(t_now - 1, &alarm.time);
-- 
2.5.0

Re: [PATCH] drivers/rtc: fix compile warning introduced by 1s reboot fix

[Alexandre Belloni]

Hi Paul,

On 11/08/2015 at 10:04:04 -0400, Paul Gortmaker wrote :
> We currently see this warning:
> 
> drivers/rtc/rtc-cmos.c:851:7: warning: unused variable 'err'
> 
> introduced by commit 7b4a008088a28ea936fffbbfa770d0184468a0ce ("rtc-cmos:
> Cancel alarm timer if alarm time is equal to now+1 seconds").
> 
> Presumably some WIP version of the commit was doing error checking
> but then the variable was not removed prior to submission, and the
> pending commits weren't on kernel.org for kbuild bot to spot the new
> warning created.
> 
> Cc: Adrian Huang <ahuang12@lenovo.com>
> Cc: Egbert Eich <eich@suse.de>
> Cc: Diego Ercolani <diego.ercolani@gmail.com>
> Cc: Borislav Petkov <bp@suse.de>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Alessandro Zummo <a.zummo@towertech.it>
> Cc: rtc-linux@googlegroups.com
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> 
> [Note: patch is against linux-next, so if the rtc tree is rebased,
>  then the above commit ID reference will be stale.  Feel free to
>  adjust the commit log appropriately, if need be, or even squash
>  this into the original offending patch, if rebasing back that far.
>  Also ensuring your tree is on kernel.org will allow kbuild bot
>  to spot these on your behalf via the zero day builds.]
> 

I'm pretty sure my rtc-next branch on kernel.org already carry the fix.
I fixed it on monday: 2015-08-10 07:12:44 (GMT). It just seems that
linux-next has not been updated since then.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com