diff options
author | Lespiau, Damien <damien.lespiau@intel.com> | 2014-03-24 11:53:17 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-03-27 22:57:45 -0400 |
commit | 1287aa903f1b9248f34fb215e3b875d2ae243425 (patch) | |
tree | 5c7ee83d6bfe99dfc323fd9b8e737ec376b6f5bc /include/drm/drmP.h | |
parent | 1288c19fbefa44bac4ba0bab8aa4b2607741f0eb (diff) |
drm: Remove the prefix argument of drm_ut_debug_printk()
This is always DRM_NAME, so we can just make it part of the format
string instead of asking prink to do it for us.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drmP.h')
-rw-r--r-- | include/drm/drmP.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index cde156293d9d..2242968e7deb 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -121,9 +121,8 @@ struct videomode; | |||
121 | #define DRM_UT_KMS 0x04 | 121 | #define DRM_UT_KMS 0x04 |
122 | #define DRM_UT_PRIME 0x08 | 122 | #define DRM_UT_PRIME 0x08 |
123 | 123 | ||
124 | extern __printf(3, 4) | 124 | extern __printf(2, 3) |
125 | void drm_ut_debug_printk(const char *prefix, | 125 | void drm_ut_debug_printk(const char *function_name, |
126 | const char *function_name, | ||
127 | const char *format, ...); | 126 | const char *format, ...); |
128 | extern __printf(2, 3) | 127 | extern __printf(2, 3) |
129 | int drm_err(const char *func, const char *format, ...); | 128 | int drm_err(const char *func, const char *format, ...); |
@@ -209,27 +208,23 @@ int drm_err(const char *func, const char *format, ...); | |||
209 | #define DRM_DEBUG(fmt, args...) \ | 208 | #define DRM_DEBUG(fmt, args...) \ |
210 | do { \ | 209 | do { \ |
211 | if (unlikely(drm_debug & DRM_UT_CORE)) \ | 210 | if (unlikely(drm_debug & DRM_UT_CORE)) \ |
212 | drm_ut_debug_printk(DRM_NAME, __func__, \ | 211 | drm_ut_debug_printk(__func__, fmt, ##args); \ |
213 | fmt, ##args); \ | ||
214 | } while (0) | 212 | } while (0) |
215 | 213 | ||
216 | #define DRM_DEBUG_DRIVER(fmt, args...) \ | 214 | #define DRM_DEBUG_DRIVER(fmt, args...) \ |
217 | do { \ | 215 | do { \ |
218 | if (unlikely(drm_debug & DRM_UT_DRIVER)) \ | 216 | if (unlikely(drm_debug & DRM_UT_DRIVER)) \ |
219 | drm_ut_debug_printk(DRM_NAME, __func__, \ | 217 | drm_ut_debug_printk(__func__, fmt, ##args); \ |
220 | fmt, ##args); \ | ||
221 | } while (0) | 218 | } while (0) |
222 | #define DRM_DEBUG_KMS(fmt, args...) \ | 219 | #define DRM_DEBUG_KMS(fmt, args...) \ |
223 | do { \ | 220 | do { \ |
224 | if (unlikely(drm_debug & DRM_UT_KMS)) \ | 221 | if (unlikely(drm_debug & DRM_UT_KMS)) \ |
225 | drm_ut_debug_printk(DRM_NAME, __func__, \ | 222 | drm_ut_debug_printk(__func__, fmt, ##args); \ |
226 | fmt, ##args); \ | ||
227 | } while (0) | 223 | } while (0) |
228 | #define DRM_DEBUG_PRIME(fmt, args...) \ | 224 | #define DRM_DEBUG_PRIME(fmt, args...) \ |
229 | do { \ | 225 | do { \ |
230 | if (unlikely(drm_debug & DRM_UT_PRIME)) \ | 226 | if (unlikely(drm_debug & DRM_UT_PRIME)) \ |
231 | drm_ut_debug_printk(DRM_NAME, __func__, \ | 227 | drm_ut_debug_printk(__func__, fmt, ##args); \ |
232 | fmt, ##args); \ | ||
233 | } while (0) | 228 | } while (0) |
234 | #else | 229 | #else |
235 | #define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0) | 230 | #define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0) |