mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-20 22:21:41 +00:00
dm: define dev_*() log functions in DM header
Many drivers had started to use dev_err, dev_info, etc. for log functions. Currently, we are relying on <linux/compat.h>, but I guess the best home is <dm/device.h>, taking into account that Linux defines them in <linux/device.h>. For now, I am leaving the ones in <linux/compat.h> because lots of Linux-originated code uses dev_*(), but the first argument is not struct udevice, so we need to ignore the bogus argument. More efforts are needed to iron out the issues. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
0a70fb4c1c
commit
c898cba41e
2 changed files with 89 additions and 0 deletions
|
@ -18,6 +18,7 @@
|
||||||
#include <linux/compat.h>
|
#include <linux/compat.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
|
#include <linux/printk.h>
|
||||||
|
|
||||||
struct driver_info;
|
struct driver_info;
|
||||||
|
|
||||||
|
@ -879,4 +880,75 @@ static inline void devm_kfree(struct udevice *dev, void *ptr)
|
||||||
|
|
||||||
#endif /* ! CONFIG_DEVRES */
|
#endif /* ! CONFIG_DEVRES */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* REVISIT:
|
||||||
|
* remove the following after resolving conflicts with <linux/compat.h>
|
||||||
|
*/
|
||||||
|
#ifdef dev_dbg
|
||||||
|
#undef dev_dbg
|
||||||
|
#endif
|
||||||
|
#ifdef dev_vdbg
|
||||||
|
#undef dev_vdbg
|
||||||
|
#endif
|
||||||
|
#ifdef dev_info
|
||||||
|
#undef dev_info
|
||||||
|
#endif
|
||||||
|
#ifdef dev_err
|
||||||
|
#undef dev_err
|
||||||
|
#endif
|
||||||
|
#ifdef dev_warn
|
||||||
|
#undef dev_warn
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* REVISIT:
|
||||||
|
* print device name like Linux
|
||||||
|
*/
|
||||||
|
#define dev_printk(dev, fmt, ...) \
|
||||||
|
({ \
|
||||||
|
printk(fmt, ##__VA_ARGS__); \
|
||||||
|
})
|
||||||
|
|
||||||
|
#define __dev_printk(level, dev, fmt, ...) \
|
||||||
|
({ \
|
||||||
|
if (level < CONFIG_VAL(LOGLEVEL)) \
|
||||||
|
dev_printk(dev, fmt, ##__VA_ARGS__); \
|
||||||
|
})
|
||||||
|
|
||||||
|
#define dev_emerg(dev, fmt, ...) \
|
||||||
|
__dev_printk(0, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define dev_alert(dev, fmt, ...) \
|
||||||
|
__dev_printk(1, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define dev_crit(dev, fmt, ...) \
|
||||||
|
__dev_printk(2, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define dev_err(dev, fmt, ...) \
|
||||||
|
__dev_printk(3, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define dev_warn(dev, fmt, ...) \
|
||||||
|
__dev_printk(4, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define dev_notice(dev, fmt, ...) \
|
||||||
|
__dev_printk(5, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define dev_info(dev, fmt, ...) \
|
||||||
|
__dev_printk(6, dev, fmt, ##__VA_ARGS__)
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
#define dev_dbg(dev, fmt, ...) \
|
||||||
|
__dev_printk(7, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#else
|
||||||
|
#define dev_dbg(dev, fmt, ...) \
|
||||||
|
({ \
|
||||||
|
if (0) \
|
||||||
|
__dev_printk(7, dev, fmt, ##__VA_ARGS__); \
|
||||||
|
})
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VERBOSE_DEBUG
|
||||||
|
#define dev_vdbg dev_dbg
|
||||||
|
#else
|
||||||
|
#define dev_vdbg(dev, fmt, ...) \
|
||||||
|
({ \
|
||||||
|
if (0) \
|
||||||
|
__dev_printk(7, dev, fmt, ##__VA_ARGS__); \
|
||||||
|
})
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -15,6 +15,23 @@ struct p_current{
|
||||||
|
|
||||||
extern struct p_current *current;
|
extern struct p_current *current;
|
||||||
|
|
||||||
|
/* avoid conflict with <dm/device.h> */
|
||||||
|
#ifdef dev_dbg
|
||||||
|
#undef dev_dbg
|
||||||
|
#endif
|
||||||
|
#ifdef dev_vdbg
|
||||||
|
#undef dev_vdbg
|
||||||
|
#endif
|
||||||
|
#ifdef dev_info
|
||||||
|
#undef dev_info
|
||||||
|
#endif
|
||||||
|
#ifdef dev_err
|
||||||
|
#undef dev_err
|
||||||
|
#endif
|
||||||
|
#ifdef dev_warn
|
||||||
|
#undef dev_warn
|
||||||
|
#endif
|
||||||
|
|
||||||
#define dev_dbg(dev, fmt, args...) \
|
#define dev_dbg(dev, fmt, args...) \
|
||||||
debug(fmt, ##args)
|
debug(fmt, ##args)
|
||||||
#define dev_vdbg(dev, fmt, args...) \
|
#define dev_vdbg(dev, fmt, args...) \
|
||||||
|
|
Loading…
Add table
Reference in a new issue