drm: extra printk() wrapper macros
We had only DRM_INFO() and DRM_ERROR(), whereas the underlying printk() provides several other useful intermediate levels such as NOTICE and WARNING. So this patch fills out the set by providing both regular and once-only macros for each of the levels INFO, NOTICE, and WARNING, using a common underlying macro that does all the token-pasting. DRM_ERROR is unchanged, as it's not just a printk wrapper. v2: Fix whitespace, missing ## (Eric Engestrom) Signed-off-by: Dave Gordon <david.s.gordon@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Cc: dri-devel@lists.freedesktop.org Acked-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
This commit is contained in:

committed by
Tvrtko Ursulin

parent
4bb05040fd
commit
30b0da8d55
@@ -163,6 +163,26 @@ void drm_err(const char *format, ...);
|
|||||||
/** \name Macros to make printk easier */
|
/** \name Macros to make printk easier */
|
||||||
/*@{*/
|
/*@{*/
|
||||||
|
|
||||||
|
#define _DRM_PRINTK(once, level, fmt, ...) \
|
||||||
|
do { \
|
||||||
|
printk##once(KERN_##level "[" DRM_NAME "] " fmt, \
|
||||||
|
##__VA_ARGS__); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define DRM_INFO(fmt, ...) \
|
||||||
|
_DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)
|
||||||
|
#define DRM_NOTE(fmt, ...) \
|
||||||
|
_DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__)
|
||||||
|
#define DRM_WARN(fmt, ...) \
|
||||||
|
_DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__)
|
||||||
|
|
||||||
|
#define DRM_INFO_ONCE(fmt, ...) \
|
||||||
|
_DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__)
|
||||||
|
#define DRM_NOTE_ONCE(fmt, ...) \
|
||||||
|
_DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__)
|
||||||
|
#define DRM_WARN_ONCE(fmt, ...) \
|
||||||
|
_DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Error output.
|
* Error output.
|
||||||
*
|
*
|
||||||
@@ -188,12 +208,6 @@ void drm_err(const char *format, ...);
|
|||||||
drm_err(fmt, ##__VA_ARGS__); \
|
drm_err(fmt, ##__VA_ARGS__); \
|
||||||
})
|
})
|
||||||
|
|
||||||
#define DRM_INFO(fmt, ...) \
|
|
||||||
printk(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
|
|
||||||
|
|
||||||
#define DRM_INFO_ONCE(fmt, ...) \
|
|
||||||
printk_once(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Debug output.
|
* Debug output.
|
||||||
*
|
*
|
||||||
|
Reference in New Issue
Block a user