diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-16 09:44:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-16 09:44:51 -0400 |
| commit | da09b99ea572cec9a114872e480b798db11f9c6e (patch) | |
| tree | ea40e8c6a93a8e6e54ead962cc709e993b607419 /include/linux | |
| parent | 9dc6aef8c963ae17e1263b89c692792fce0c7198 (diff) | |
| parent | 4a1989c0bc77565493fd142ce224d5d0c88deda9 (diff) | |
| download | u-boot-da09b99ea572cec9a114872e480b798db11f9c6e.tar.gz u-boot-da09b99ea572cec9a114872e480b798db11f9c6e.tar.xz u-boot-da09b99ea572cec9a114872e480b798db11f9c6e.zip | |
Merge branch '2020-10-15-further-cleanup_dev_xxx'
- Bring in the next round of dev_xxx cleanup patches.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compat.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index d129780312..38549baa25 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -24,34 +24,6 @@ struct p_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...) \ - debug(fmt, ##args) -#define dev_vdbg(dev, fmt, args...) \ - debug(fmt, ##args) -#define dev_info(dev, fmt, args...) \ - printf(fmt, ##args) -#define dev_err(dev, fmt, args...) \ - printf(fmt, ##args) -#define dev_warn(dev, fmt, args...) \ - printf(fmt, ##args) - #define GFP_ATOMIC ((gfp_t) 0) #define GFP_KERNEL ((gfp_t) 0) #define GFP_NOFS ((gfp_t) 0) |