* [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions
@ 2011-09-23 19:09 Marek Vasut
2011-09-23 19:09 ` [U-Boot] [PATCH 2/2] GCC4.6: Remove unused "port" variable in cmd_usb.c Marek Vasut
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Marek Vasut @ 2011-09-23 19:09 UTC (permalink / raw)
To: u-boot
Fixes problems similar to the following ones:
cmd_date.c: In function ?do_date?:
cmd_date.c:50:6: warning: variable ?old_bus? set but not used
[-Wunused-but-set-variable]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
common/usb.c | 4 ++--
include/common.h | 4 ++--
include/i2c.h | 5 ++++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/common/usb.c b/common/usb.c
index a401c09..a5f9e9f 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -63,7 +63,7 @@
#ifdef USB_DEBUG
#define USB_PRINTF(fmt, args...) printf(fmt , ##args)
#else
-#define USB_PRINTF(fmt, args...)
+static inline void USB_PRINTF(const char *fmt, ...) {}
#endif
#define USB_BUFSIZ 512
@@ -970,7 +970,7 @@ void usb_scan_devices(void)
#ifdef USB_HUB_DEBUG
#define USB_HUB_PRINTF(fmt, args...) printf(fmt , ##args)
#else
-#define USB_HUB_PRINTF(fmt, args...)
+static inline void USB_HUB_PRINTF(const char *fmt, ...) {}
#endif
diff --git a/include/common.h b/include/common.h
index d244bd4..5c6822a 100644
--- a/include/common.h
+++ b/include/common.h
@@ -120,8 +120,8 @@ typedef volatile unsigned char vu_char;
#define debug(fmt,args...) printf (fmt ,##args)
#define debugX(level,fmt,args...) if (DEBUG>=level) printf(fmt,##args);
#else
-#define debug(fmt,args...)
-#define debugX(level,fmt,args...)
+static inline void debug(const char *fmt, ...) {}
+static inline void debugX(const char *fmt, ...) {}
#endif /* DEBUG */
#ifdef DEBUG
diff --git a/include/i2c.h b/include/i2c.h
index 8ceb4c8..323150d 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -55,7 +55,10 @@
#else
#define CONFIG_SYS_MAX_I2C_BUS 1
#define I2C_GET_BUS() 0
-#define I2C_SET_BUS(a)
+static inline int I2C_SET_BUS(unsigned int bus)
+{
+ return 0;
+}
#endif
/* define the I2C bus number for RTC and DTT if not already done */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 2/2] GCC4.6: Remove unused "port" variable in cmd_usb.c
2011-09-23 19:09 [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions Marek Vasut
@ 2011-09-23 19:09 ` Marek Vasut
2011-09-24 17:37 ` Remy Bohmer
2011-09-23 20:33 ` [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions Mike Frysinger
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2011-09-23 19:09 UTC (permalink / raw)
To: u-boot
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
common/cmd_usb.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index cd4d417..8c87265 100644
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -281,7 +281,7 @@ static inline char *portspeed(int speed)
void usb_show_tree_graph(struct usb_device *dev, char *pre)
{
int i, index;
- int has_child, last_child, port;
+ int has_child, last_child;
index = strlen(pre);
printf(" %s", pre);
@@ -300,7 +300,6 @@ void usb_show_tree_graph(struct usb_device *dev, char *pre)
/* found our pointer, see if we have a
* little sister
*/
- port = i;
while (i++ < dev->parent->maxchild) {
if (dev->parent->children[i] != NULL) {
/* found a sister */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions
2011-09-23 19:09 [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions Marek Vasut
2011-09-23 19:09 ` [U-Boot] [PATCH 2/2] GCC4.6: Remove unused "port" variable in cmd_usb.c Marek Vasut
@ 2011-09-23 20:33 ` Mike Frysinger
2011-09-23 21:52 ` Marek Vasut
2011-09-23 22:22 ` [U-Boot] [PATCH] " Marek Vasut
2011-09-23 22:22 ` [U-Boot] [PATCH 1/2 V2] " Marek Vasut
3 siblings, 1 reply; 10+ messages in thread
From: Mike Frysinger @ 2011-09-23 20:33 UTC (permalink / raw)
To: u-boot
On Friday, September 23, 2011 15:09:52 Marek Vasut wrote:
> --- a/include/common.h
> +++ b/include/common.h
>
> -#define debugX(level,fmt,args...)
> +static inline void debugX(const char *fmt, ...) {}
NAK: you broke debugX()
personally i'd prefer we unify these like we did with the assert(), but this
change is better than nothing
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110923/ce8ec9bd/attachment.pgp
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions
2011-09-23 20:33 ` [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions Mike Frysinger
@ 2011-09-23 21:52 ` Marek Vasut
2011-09-23 23:04 ` Mike Frysinger
0 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2011-09-23 21:52 UTC (permalink / raw)
To: u-boot
> On Friday, September 23, 2011 15:09:52 Marek Vasut wrote:
> > --- a/include/common.h
> > +++ b/include/common.h
> >
> > -#define debugX(level,fmt,args...)
> > +static inline void debugX(const char *fmt, ...) {}
>
> NAK:? you broke debugX()
oh, right, good catch. But is this macro even used anyway?
>
> personally i'd prefer we unify these like we did with the assert(), but
> this? change is better than nothing
> -mike
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH] GCC4.6: Convert various empty macros to inline functions
2011-09-23 19:09 [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions Marek Vasut
2011-09-23 19:09 ` [U-Boot] [PATCH 2/2] GCC4.6: Remove unused "port" variable in cmd_usb.c Marek Vasut
2011-09-23 20:33 ` [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions Mike Frysinger
@ 2011-09-23 22:22 ` Marek Vasut
2011-09-23 22:22 ` [U-Boot] [PATCH 1/2 V2] " Marek Vasut
3 siblings, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2011-09-23 22:22 UTC (permalink / raw)
To: u-boot
Fixes problems similar to the following ones:
cmd_date.c: In function ?do_date?:
cmd_date.c:50:6: warning: variable ?old_bus? set but not used
[-Wunused-but-set-variable]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
common/usb.c | 4 ++--
include/common.h | 4 ++--
include/i2c.h | 5 ++++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/common/usb.c b/common/usb.c
index a401c09..a5f9e9f 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -63,7 +63,7 @@
#ifdef USB_DEBUG
#define USB_PRINTF(fmt, args...) printf(fmt , ##args)
#else
-#define USB_PRINTF(fmt, args...)
+static inline void USB_PRINTF(const char *fmt, ...) {}
#endif
#define USB_BUFSIZ 512
@@ -970,7 +970,7 @@ void usb_scan_devices(void)
#ifdef USB_HUB_DEBUG
#define USB_HUB_PRINTF(fmt, args...) printf(fmt , ##args)
#else
-#define USB_HUB_PRINTF(fmt, args...)
+static inline void USB_HUB_PRINTF(const char *fmt, ...) {}
#endif
diff --git a/include/common.h b/include/common.h
index d244bd4..aeb2d84 100644
--- a/include/common.h
+++ b/include/common.h
@@ -120,8 +120,8 @@ typedef volatile unsigned char vu_char;
#define debug(fmt,args...) printf (fmt ,##args)
#define debugX(level,fmt,args...) if (DEBUG>=level) printf(fmt,##args);
#else
-#define debug(fmt,args...)
-#define debugX(level,fmt,args...)
+static inline void debug(const char *fmt, ...) {}
+static inline void debugX(int level, const char *fmt, ...) {}
#endif /* DEBUG */
#ifdef DEBUG
diff --git a/include/i2c.h b/include/i2c.h
index 8ceb4c8..323150d 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -55,7 +55,10 @@
#else
#define CONFIG_SYS_MAX_I2C_BUS 1
#define I2C_GET_BUS() 0
-#define I2C_SET_BUS(a)
+static inline int I2C_SET_BUS(unsigned int bus)
+{
+ return 0;
+}
#endif
/* define the I2C bus number for RTC and DTT if not already done */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 1/2 V2] GCC4.6: Convert various empty macros to inline functions
2011-09-23 19:09 [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions Marek Vasut
` (2 preceding siblings ...)
2011-09-23 22:22 ` [U-Boot] [PATCH] " Marek Vasut
@ 2011-09-23 22:22 ` Marek Vasut
3 siblings, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2011-09-23 22:22 UTC (permalink / raw)
To: u-boot
Fixes problems similar to the following ones:
cmd_date.c: In function ?do_date?:
cmd_date.c:50:6: warning: variable ?old_bus? set but not used
[-Wunused-but-set-variable]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
common/usb.c | 4 ++--
include/common.h | 4 ++--
include/i2c.h | 5 ++++-
3 files changed, 8 insertions(+), 5 deletions(-)
V2: Correct debugX()
diff --git a/common/usb.c b/common/usb.c
index a401c09..a5f9e9f 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -63,7 +63,7 @@
#ifdef USB_DEBUG
#define USB_PRINTF(fmt, args...) printf(fmt , ##args)
#else
-#define USB_PRINTF(fmt, args...)
+static inline void USB_PRINTF(const char *fmt, ...) {}
#endif
#define USB_BUFSIZ 512
@@ -970,7 +970,7 @@ void usb_scan_devices(void)
#ifdef USB_HUB_DEBUG
#define USB_HUB_PRINTF(fmt, args...) printf(fmt , ##args)
#else
-#define USB_HUB_PRINTF(fmt, args...)
+static inline void USB_HUB_PRINTF(const char *fmt, ...) {}
#endif
diff --git a/include/common.h b/include/common.h
index d244bd4..aeb2d84 100644
--- a/include/common.h
+++ b/include/common.h
@@ -120,8 +120,8 @@ typedef volatile unsigned char vu_char;
#define debug(fmt,args...) printf (fmt ,##args)
#define debugX(level,fmt,args...) if (DEBUG>=level) printf(fmt,##args);
#else
-#define debug(fmt,args...)
-#define debugX(level,fmt,args...)
+static inline void debug(const char *fmt, ...) {}
+static inline void debugX(int level, const char *fmt, ...) {}
#endif /* DEBUG */
#ifdef DEBUG
diff --git a/include/i2c.h b/include/i2c.h
index 8ceb4c8..323150d 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -55,7 +55,10 @@
#else
#define CONFIG_SYS_MAX_I2C_BUS 1
#define I2C_GET_BUS() 0
-#define I2C_SET_BUS(a)
+static inline int I2C_SET_BUS(unsigned int bus)
+{
+ return 0;
+}
#endif
/* define the I2C bus number for RTC and DTT if not already done */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions
2011-09-23 21:52 ` Marek Vasut
@ 2011-09-23 23:04 ` Mike Frysinger
2011-09-24 0:40 ` Marek Vasut
0 siblings, 1 reply; 10+ messages in thread
From: Mike Frysinger @ 2011-09-23 23:04 UTC (permalink / raw)
To: u-boot
On Friday, September 23, 2011 17:52:35 Marek Vasut wrote:
> > On Friday, September 23, 2011 15:09:52 Marek Vasut wrote:
> > > --- a/include/common.h
> > > +++ b/include/common.h
> > >
> > > -#define debugX(level,fmt,args...)
> > > +static inline void debugX(const char *fmt, ...) {}
> >
> > NAK: you broke debugX()
>
> oh, right, good catch. But is this macro even used anyway?
grep says yes, a little
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110923/e5fc465b/attachment.pgp
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions
2011-09-23 23:04 ` Mike Frysinger
@ 2011-09-24 0:40 ` Marek Vasut
2011-09-24 5:05 ` Mike Frysinger
0 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2011-09-24 0:40 UTC (permalink / raw)
To: u-boot
On Saturday, September 24, 2011 01:04:51 AM Mike Frysinger wrote:
> On Friday, September 23, 2011 17:52:35 Marek Vasut wrote:
> > > On Friday, September 23, 2011 15:09:52 Marek Vasut wrote:
> > > > --- a/include/common.h
> > > > +++ b/include/common.h
> > > >
> > > > -#define debugX(level,fmt,args...)
> > > > +static inline void debugX(const char *fmt, ...) {}
> > >
> > > NAK: you broke debugX()
> >
> > oh, right, good catch. But is this macro even used anyway?
>
> grep says yes, a little
> -mike
Maybe we should just squash it and get rid of it altogether ?
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions
2011-09-24 0:40 ` Marek Vasut
@ 2011-09-24 5:05 ` Mike Frysinger
0 siblings, 0 replies; 10+ messages in thread
From: Mike Frysinger @ 2011-09-24 5:05 UTC (permalink / raw)
To: u-boot
On Friday, September 23, 2011 20:40:25 Marek Vasut wrote:
> On Saturday, September 24, 2011 01:04:51 AM Mike Frysinger wrote:
> > On Friday, September 23, 2011 17:52:35 Marek Vasut wrote:
> > > > On Friday, September 23, 2011 15:09:52 Marek Vasut wrote:
> > > > > --- a/include/common.h
> > > > > +++ b/include/common.h
> > > > >
> > > > > -#define debugX(level,fmt,args...)
> > > > > +static inline void debugX(const char *fmt, ...) {}
> > > >
> > > > NAK: you broke debugX()
> > >
> > > oh, right, good catch. But is this macro even used anyway?
> >
> > grep says yes, a little
>
> Maybe we should just squash it and get rid of it altogether ?
i've rarely found a need for this sort of style of debug logging, so i
wouldn't mind seeing it go
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110924/ed6f5ad5/attachment.pgp
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 2/2] GCC4.6: Remove unused "port" variable in cmd_usb.c
2011-09-23 19:09 ` [U-Boot] [PATCH 2/2] GCC4.6: Remove unused "port" variable in cmd_usb.c Marek Vasut
@ 2011-09-24 17:37 ` Remy Bohmer
0 siblings, 0 replies; 10+ messages in thread
From: Remy Bohmer @ 2011-09-24 17:37 UTC (permalink / raw)
To: u-boot
Hi,
2011/9/23 Marek Vasut <marek.vasut@gmail.com>:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
> ?common/cmd_usb.c | ? ?3 +--
> ?1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/common/cmd_usb.c b/common/cmd_usb.c
> index cd4d417..8c87265 100644
> --- a/common/cmd_usb.c
> +++ b/common/cmd_usb.c
> @@ -281,7 +281,7 @@ static inline char *portspeed(int speed)
> ?void usb_show_tree_graph(struct usb_device *dev, char *pre)
> ?{
> ? ? ? ?int i, index;
> - ? ? ? int has_child, last_child, port;
> + ? ? ? int has_child, last_child;
>
> ? ? ? ?index = strlen(pre);
> ? ? ? ?printf(" %s", pre);
> @@ -300,7 +300,6 @@ void usb_show_tree_graph(struct usb_device *dev, char *pre)
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?/* found our pointer, see if we have a
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? * little sister
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? port = i;
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?while (i++ < dev->parent->maxchild) {
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?if (dev->parent->children[i] != NULL) {
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?/* found a sister */
If it was not part of a patch-series, I would have pulled it in directly...
Acked-by: Remy Bohmer <linux@bohmer.net>
Kind regards,
Remy
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-09-24 17:37 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-23 19:09 [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions Marek Vasut
2011-09-23 19:09 ` [U-Boot] [PATCH 2/2] GCC4.6: Remove unused "port" variable in cmd_usb.c Marek Vasut
2011-09-24 17:37 ` Remy Bohmer
2011-09-23 20:33 ` [U-Boot] [PATCH 1/2] GCC4.6: Convert various empty macros to inline functions Mike Frysinger
2011-09-23 21:52 ` Marek Vasut
2011-09-23 23:04 ` Mike Frysinger
2011-09-24 0:40 ` Marek Vasut
2011-09-24 5:05 ` Mike Frysinger
2011-09-23 22:22 ` [U-Boot] [PATCH] " Marek Vasut
2011-09-23 22:22 ` [U-Boot] [PATCH 1/2 V2] " Marek Vasut
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.