openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm: drm_err: Remove unnecessary __func__ argument 

Removing the unnecessary drm_err __func__ argument by using
the equivalent %pf and __builtin_return_address(0) makes the
code smaller for every use of the DRM_ERROR macro.

For instance: (allmodconfig)

$ size drivers/gpu/drm/i915/i915.o*
   text	   data	    bss	    dec	    hex	filename
 922447	 193257	 296736	1412440	 158d58	drivers/gpu/drm/i915/i915.o.new
 928111	 193257	 296736	1418104	 15a378	drivers/gpu/drm/i915/i915.o.old

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Joe Perches 2014-10-11 22:08:57 -07:00 committed by Daniel Vetter
parent bd008e5b29
commit a1f1a79c51
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/drm_drv.c
View File

@ -56,7 +56,7 @@ static struct idr drm_minors_idr;
struct class *drm_class; struct class *drm_class;
static struct dentry *drm_debugfs_root; static struct dentry *drm_debugfs_root;
void drm_err(const char *func, const char *format, ...) void drm_err(const char *format, ...)
{ {
struct va_format vaf; struct va_format vaf;
va_list args; va_list args;
@ -66,7 +66,8 @@ void drm_err(const char *func, const char *format, ...)
vaf.fmt = format; vaf.fmt = format;
vaf.va = &args; vaf.va = &args;
printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* %pV", func, &vaf); printk(KERN_ERR "[" DRM_NAME ":%pf] *ERROR* %pV",
__builtin_return_address(0), &vaf);
va_end(args); va_end(args);
} }

8
include/drm/drmP.h
View File

@ -125,8 +125,8 @@ struct dma_buf_attachment;
extern __printf(2, 3) extern __printf(2, 3)
void drm_ut_debug_printk(const char *function_name, void drm_ut_debug_printk(const char *function_name,
const char *format, ...); const char *format, ...);
extern __printf(2, 3) extern __printf(1, 2)
void drm_err(const char *func, const char *format, ...); void drm_err(const char *format, ...);
/***********************************************************************/ /***********************************************************************/
/** \name DRM template customization defaults */ /** \name DRM template customization defaults */
@ -155,7 +155,7 @@ void drm_err(const char *func, const char *format, ...);
* \param arg arguments * \param arg arguments
*/ */
#define DRM_ERROR(fmt, ...) \ #define DRM_ERROR(fmt, ...) \
drm_err(__func__, fmt, ##__VA_ARGS__) drm_err(fmt, ##__VA_ARGS__)
/** /**
* Rate limited error output. Like DRM_ERROR() but won't flood the log. * Rate limited error output. Like DRM_ERROR() but won't flood the log.
@ -170,7 +170,7 @@ void drm_err(const char *func, const char *format, ...);
DEFAULT_RATELIMIT_BURST); \ DEFAULT_RATELIMIT_BURST); \
\ \
if (__ratelimit(&_rs)) \ if (__ratelimit(&_rs)) \
drm_err(__func__, fmt, ##__VA_ARGS__); \ drm_err(fmt, ##__VA_ARGS__); \
}) })
#define DRM_INFO(fmt, ...) \ #define DRM_INFO(fmt, ...) \