diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-10-04 21:19:19 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-04 21:19:19 +0200 |
| commit | f092f15d39d1a223b240eb83dc3f4c64a02a8ea6 (patch) | |
| tree | 331b256fb756d9c199456003c3f07804bcbe8896 | |
| parent | 7b8ffea2ac44097ed1c99ba70b8c6a4cf12ba0b4 (diff) | |
Revert "GCC4.6: Convert various empty macros to inline functions"
This reverts commit 60ce53cf9f408d9ad721f8e7a87d6a564e6d5bac.
The commit causes build breakage for a number of boards. This results
from the fact that now the arguments of debug() actually get
referenced (even if there is hope that the compiler will optimize
away the debug() call). The obvious fix to that probem (change the
code to always declare the referenced variables and data structures)
increases the code size, and was this rejected. So it was decided to
revert this commit until a better solution is found.
| -rw-r--r-- | common/usb.c | 4 | ||||
| -rw-r--r-- | common/usb_storage.c | 2 | ||||
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | include/i2c.h | 5 |
4 files changed, 6 insertions, 9 deletions
diff --git a/common/usb.c b/common/usb.c index a5f9e9f5b05..a401c091987 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 -static inline void USB_PRINTF(const char *fmt, ...) {} +#define USB_PRINTF(fmt, args...) #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 -static inline void USB_HUB_PRINTF(const char *fmt, ...) {} +#define USB_HUB_PRINTF(fmt, args...) #endif diff --git a/common/usb_storage.c b/common/usb_storage.c index 5c56918e260..16667f39482 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -63,7 +63,7 @@ #ifdef USB_STOR_DEBUG #define USB_STOR_PRINTF(fmt, args...) printf(fmt , ##args) #else -static inline void USB_STOR_PRINTF(const char *fmt, ...) {} +#define USB_STOR_PRINTF(fmt, args...) #endif #include <scsi.h> diff --git a/include/common.h b/include/common.h index aeb2d8436b6..d244bd40b5b 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 -static inline void debug(const char *fmt, ...) {} -static inline void debugX(int level, const char *fmt, ...) {} +#define debug(fmt,args...) +#define debugX(level,fmt,args...) #endif /* DEBUG */ #ifdef DEBUG diff --git a/include/i2c.h b/include/i2c.h index 323150ded9e..8ceb4c85214 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -55,10 +55,7 @@ #else #define CONFIG_SYS_MAX_I2C_BUS 1 #define I2C_GET_BUS() 0 -static inline int I2C_SET_BUS(unsigned int bus) -{ - return 0; -} +#define I2C_SET_BUS(a) #endif /* define the I2C bus number for RTC and DTT if not already done */ |