Skip to contentSkip to conversation

rtc: armada38x: remove unused variables

PATCH New Arnd Bergmann 2 participants 2 messages May 12, 2015

Subsystems (2)
Real time clock (RTC) Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 rtc: armada38x: remove unused variables

A recent bugfix introduced a new compiler warning in the rtc-armada38x driver:

drivers/rtc/rtc-armada38x.c: In function 'armada38x_rtc_read_time':
drivers/rtc/rtc-armada38x.c:67:34: warning: unused variable 'flags' [-Wunused-variable]
unsigned long time, time_check, flags;

This removes the now obsolete variables to get rid of the warning. As the orginal fix was marked for stable backports [4.0], this one should be backported as well.

Signed-off-by Arnd Bergmann <[email protected]>
Fixes 489405fe5ed38 ("rtc: armada38x: fix concurrency access in armada38x_rtc_set_time")
Cc stable at vger.kernel.org
drivers/rtc/rtc-armada38x.c +2 -2
index cb70ced7e0db..2b08cac62f07 100644
@@ -64,7 +64,7 @@ static void rtc_delayed_write(u32 val, struct armada38x_rtc *rtc, int offset)
 static int armada38x_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
 	struct armada38x_rtc *rtc = dev_get_drvdata(dev);
-	unsigned long time, time_check, flags;
+	unsigned long time, time_check;
 
 	mutex_lock(&rtc->mutex_time);
 	time = readl(rtc->regs + RTC_TIME);

@@ -88,7 +88,7 @@ static int armada38x_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
 	struct armada38x_rtc *rtc = dev_get_drvdata(dev);
 	int ret = 0;
-	unsigned long time, flags;
+	unsigned long time;
 
 	ret = rtc_tm_to_time(tm, &time);
#1 lore raw

PATCH 1/1 rtc: armada38x: remove unused variables

Hi,

Quoted 7 lines · Arnd Bergmann

A recent bugfix introduced a new compiler warning in the rtc-armada38x driver:

drivers/rtc/rtc-armada38x.c: In function 'armada38x_rtc_read_time':
drivers/rtc/rtc-armada38x.c:67:34: warning: unused variable 'flags' [-Wunused-variable]
unsigned long time, time_check, flags;

Quoted 8 lines

This removes the now obsolete variables to get rid of the warning. As the orginal fix was marked for stable backports [4.0], this one should be backported as well.

Signed-off-by Arnd Bergmann <[email protected]>
Fixes 489405fe5ed38 ("rtc: armada38x: fix concurrency access in armada38x_rtc_set_time")
Cc stable at vger.kernel.org

That one has already been sent by Gregory ;)

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