diff mbox

[U-Boot] drivers/rtc/ds1337.c: fix GCC 4.6 build warnings

Message ID 1319917151-14369-1-git-send-email-wd@denx.de
State Accepted
Commit 88b2533de020660c32581434cd1ae56b4db2197d
Headers show

Commit Message

Wolfgang Denk Oct. 29, 2011, 7:39 p.m. UTC
Fix:
ds1337.c: In function 'rtc_get':
ds1337.c:88:52: warning: variable 'control' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 drivers/rtc/ds1337.c |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)

Comments

Marek Vasut Oct. 29, 2011, 10:39 p.m. UTC | #1
> Fix:
> ds1337.c: In function 'rtc_get':
> ds1337.c:88:52: warning: variable 'control' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  drivers/rtc/ds1337.c |   16 +++-------------
>  1 files changed, 3 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c
> index 7abf041..5bb9f94 100644
> --- a/drivers/rtc/ds1337.c
> +++ b/drivers/rtc/ds1337.c
> @@ -34,16 +34,6 @@
> 
>  #if defined(CONFIG_CMD_DATE)
> 
> -/*---------------------------------------------------------------------*/
> -#undef DEBUG_RTC
> -
> -#ifdef DEBUG_RTC
> -#define DEBUGR(fmt,args...) printf(fmt ,##args)
> -#else
> -#define DEBUGR(fmt,args...)
> -#endif
> -/*---------------------------------------------------------------------*/
> -

This undermines the ability of fine-grained debuging output, right? Now you can 
only debug whole uboot or nothing ... correct me if I'm wrong please.

>  /*
>   * RTC register addresses
>   */
> @@ -97,7 +87,7 @@ int rtc_get (struct rtc_time *tmp)
>  	mon_cent = rtc_read (RTC_MON_REG_ADDR);
>  	year = rtc_read (RTC_YR_REG_ADDR);
> 
> -	DEBUGR ("Get RTC year: %02x mon/cent: %02x mday: %02x wday: %02x "
> +	debug("Get RTC year: %02x mon/cent: %02x mday: %02x wday: %02x "
>  		"hr: %02x min: %02x sec: %02x control: %02x status: %02x\n",
>  		year, mon_cent, mday, wday, hour, min, sec, control, status);
> 

Cheers
Wolfgang Denk Oct. 30, 2011, 1:11 p.m. UTC | #2
Dear Marek Vasut,

In message <201110300039.59309.marek.vasut@gmail.com> you wrote:
> 
> > -#undef DEBUG_RTC
> > -
> > -#ifdef DEBUG_RTC
> > -#define DEBUGR(fmt,args...) printf(fmt ,##args)
> > -#else
> > -#define DEBUGR(fmt,args...)
> > -#endif
> > -/*---------------------------------------------------------------------*/
> > -
> 
> This undermines the ability of fine-grained debuging output, right? Now you can 
> only debug whole uboot or nothing ... correct me if I'm wrong please.

The normal way to enable debugging on file scope is to compile only
the respective files with DEBUG defined.


Best regards,

Wolfgang Denk
Marek Vasut Oct. 30, 2011, 8:12 p.m. UTC | #3
> Dear Marek Vasut,
> 
> In message <201110300039.59309.marek.vasut@gmail.com> you wrote:
> > > -#undef DEBUG_RTC
> > > -
> > > -#ifdef DEBUG_RTC
> > > -#define DEBUGR(fmt,args...) printf(fmt ,##args)
> > > -#else
> > > -#define DEBUGR(fmt,args...)
> > > -#endif
> > > -/*--------------------------------------------------------------------
> > > -*/ -
> > 
> > This undermines the ability of fine-grained debuging output, right? Now
> > you can only debug whole uboot or nothing ... correct me if I'm wrong
> > please.
> 
> The normal way to enable debugging on file scope is to compile only
> the respective files with DEBUG defined.
> 
> 
> Best regards,
> 
> Wolfgang Denk

Roger that !!
Wolfgang Denk Nov. 3, 2011, 7:41 p.m. UTC | #4
Dear Wolfgang Denk,

In message <1319917151-14369-1-git-send-email-wd@denx.de> you wrote:
> Fix:
> ds1337.c: In function 'rtc_get':
> ds1337.c:88:52: warning: variable 'control' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  drivers/rtc/ds1337.c |   16 +++-------------
>  1 files changed, 3 insertions(+), 13 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c
index 7abf041..5bb9f94 100644
--- a/drivers/rtc/ds1337.c
+++ b/drivers/rtc/ds1337.c
@@ -34,16 +34,6 @@ 
 
 #if defined(CONFIG_CMD_DATE)
 
-/*---------------------------------------------------------------------*/
-#undef DEBUG_RTC
-
-#ifdef DEBUG_RTC
-#define DEBUGR(fmt,args...) printf(fmt ,##args)
-#else
-#define DEBUGR(fmt,args...)
-#endif
-/*---------------------------------------------------------------------*/
-
 /*
  * RTC register addresses
  */
@@ -97,7 +87,7 @@  int rtc_get (struct rtc_time *tmp)
 	mon_cent = rtc_read (RTC_MON_REG_ADDR);
 	year = rtc_read (RTC_YR_REG_ADDR);
 
-	DEBUGR ("Get RTC year: %02x mon/cent: %02x mday: %02x wday: %02x "
+	debug("Get RTC year: %02x mon/cent: %02x mday: %02x wday: %02x "
 		"hr: %02x min: %02x sec: %02x control: %02x status: %02x\n",
 		year, mon_cent, mday, wday, hour, min, sec, control, status);
 
@@ -119,7 +109,7 @@  int rtc_get (struct rtc_time *tmp)
 	tmp->tm_yday = 0;
 	tmp->tm_isdst= 0;
 
-	DEBUGR ("Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+	debug("Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
 		tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
 		tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
 
@@ -134,7 +124,7 @@  int rtc_set (struct rtc_time *tmp)
 {
 	uchar century;
 
-	DEBUGR ("Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+	debug("Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
 		tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
 		tmp->tm_hour, tmp->tm_min, tmp->tm_sec);