summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-02-15 16:26:38 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-02-15 16:37:46 +0100
commit941aa21f26caf766077810969f1ed0eac6bb0886 (patch)
treeb3ea033da09233bef642c063f632a713bec2c01e
parenta40e76cebcbe8b025bafdefdc6e27b7553209ed7 (diff)
downloadbarebox-941aa21f26caf766077810969f1ed0eac6bb0886.tar.gz
barebox-941aa21f26caf766077810969f1ed0eac6bb0886.tar.xz
fix brown paper bag bug introduced with compile time loglevel
__dev_printf is a define which uses a local variable 'ret'. This means that whenever someone does a dev_*(dev, "ret: %d\n", ret); ret will be 0. Fix this by writing this without a local variable. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--include/printk.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/printk.h b/include/printk.h
index 1d45616f5..3de890547 100644
--- a/include/printk.h
+++ b/include/printk.h
@@ -23,10 +23,7 @@ int dev_printf(const struct device_d *dev, const char *format, ...)
#define __dev_printf(level, dev, format, args...) \
({ \
- int ret = 0; \
- if (level <= LOGLEVEL) \
- ret = dev_printf(dev, format, ##args); \
- ret; \
+ (level) <= LOGLEVEL ? dev_printf((dev), (format), ##args) : 0; \
})