Message ID | 20191122102212.400158-4-alexandre.belloni@bootlin.com |
---|---|
State | Accepted |
Headers | show |
Series | rtc: fix W=1 warnings and errors | expand |
On 11/22/2019 05:22, Alexandre Belloni wrote: > Fix the following warnings: > drivers/rtc/rtc-ds1685.c: In function ‘ds1685_rtc_read_time’: > drivers/rtc/rtc-ds1685.c:264:5: warning: variable ‘ctrlb’ set but not used [-Wunused-but-set-variable] > 264 | u8 ctrlb, century; > | ^~~~~ > drivers/rtc/rtc-ds1685.c: In function ‘ds1685_rtc_proc’: > drivers/rtc/rtc-ds1685.c:758:19: warning: variable ‘ctrlc’ set but not used [-Wunused-but-set-variable] > 758 | u8 ctrla, ctrlb, ctrlc, ctrld, ctrl4a, ctrl4b, ssn[8]; > | ^~~~~ > Cc: Joshua Kinard <kumba@gentoo.org> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > drivers/rtc/rtc-ds1685.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c > index 98d06b3ee913..8419595e7da7 100644 > --- a/drivers/rtc/rtc-ds1685.c > +++ b/drivers/rtc/rtc-ds1685.c > @@ -261,7 +261,7 @@ static int > ds1685_rtc_read_time(struct device *dev, struct rtc_time *tm) > { > struct ds1685_priv *rtc = dev_get_drvdata(dev); > - u8 ctrlb, century; > + u8 century; > u8 seconds, minutes, hours, wday, mday, month, years; > > /* Fetch the time info from the RTC registers. */ > @@ -274,7 +274,6 @@ ds1685_rtc_read_time(struct device *dev, struct rtc_time *tm) > month = rtc->read(rtc, RTC_MONTH); > years = rtc->read(rtc, RTC_YEAR); > century = rtc->read(rtc, RTC_CENTURY); > - ctrlb = rtc->read(rtc, RTC_CTRL_B); > ds1685_rtc_end_data_access(rtc); > > /* bcd2bin if needed, perform fixups, and store to rtc_time. */ > @@ -755,7 +754,7 @@ static int > ds1685_rtc_proc(struct device *dev, struct seq_file *seq) > { > struct ds1685_priv *rtc = dev_get_drvdata(dev); > - u8 ctrla, ctrlb, ctrlc, ctrld, ctrl4a, ctrl4b, ssn[8]; > + u8 ctrla, ctrlb, ctrld, ctrl4a, ctrl4b, ssn[8]; > char *model; > > /* Read all the relevant data from the control registers. */ > @@ -763,7 +762,6 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) > ds1685_rtc_get_ssn(rtc, ssn); > ctrla = rtc->read(rtc, RTC_CTRL_A); > ctrlb = rtc->read(rtc, RTC_CTRL_B); > - ctrlc = rtc->read(rtc, RTC_CTRL_C); > ctrld = rtc->read(rtc, RTC_CTRL_D); > ctrl4a = rtc->read(rtc, RTC_EXT_CTRL_4A); > ctrl4b = rtc->read(rtc, RTC_EXT_CTRL_4B); > Acked-By: Joshua Kinard <kumba@gentoo.org>
diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c index 98d06b3ee913..8419595e7da7 100644 --- a/drivers/rtc/rtc-ds1685.c +++ b/drivers/rtc/rtc-ds1685.c @@ -261,7 +261,7 @@ static int ds1685_rtc_read_time(struct device *dev, struct rtc_time *tm) { struct ds1685_priv *rtc = dev_get_drvdata(dev); - u8 ctrlb, century; + u8 century; u8 seconds, minutes, hours, wday, mday, month, years; /* Fetch the time info from the RTC registers. */ @@ -274,7 +274,6 @@ ds1685_rtc_read_time(struct device *dev, struct rtc_time *tm) month = rtc->read(rtc, RTC_MONTH); years = rtc->read(rtc, RTC_YEAR); century = rtc->read(rtc, RTC_CENTURY); - ctrlb = rtc->read(rtc, RTC_CTRL_B); ds1685_rtc_end_data_access(rtc); /* bcd2bin if needed, perform fixups, and store to rtc_time. */ @@ -755,7 +754,7 @@ static int ds1685_rtc_proc(struct device *dev, struct seq_file *seq) { struct ds1685_priv *rtc = dev_get_drvdata(dev); - u8 ctrla, ctrlb, ctrlc, ctrld, ctrl4a, ctrl4b, ssn[8]; + u8 ctrla, ctrlb, ctrld, ctrl4a, ctrl4b, ssn[8]; char *model; /* Read all the relevant data from the control registers. */ @@ -763,7 +762,6 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) ds1685_rtc_get_ssn(rtc, ssn); ctrla = rtc->read(rtc, RTC_CTRL_A); ctrlb = rtc->read(rtc, RTC_CTRL_B); - ctrlc = rtc->read(rtc, RTC_CTRL_C); ctrld = rtc->read(rtc, RTC_CTRL_D); ctrl4a = rtc->read(rtc, RTC_EXT_CTRL_4A); ctrl4b = rtc->read(rtc, RTC_EXT_CTRL_4B);
Fix the following warnings: drivers/rtc/rtc-ds1685.c: In function ‘ds1685_rtc_read_time’: drivers/rtc/rtc-ds1685.c:264:5: warning: variable ‘ctrlb’ set but not used [-Wunused-but-set-variable] 264 | u8 ctrlb, century; | ^~~~~ drivers/rtc/rtc-ds1685.c: In function ‘ds1685_rtc_proc’: drivers/rtc/rtc-ds1685.c:758:19: warning: variable ‘ctrlc’ set but not used [-Wunused-but-set-variable] 758 | u8 ctrla, ctrlb, ctrlc, ctrld, ctrl4a, ctrl4b, ssn[8]; | ^~~~~ Cc: Joshua Kinard <kumba@gentoo.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> --- drivers/rtc/rtc-ds1685.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)