summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-09-22 18:30:11 +0200
committerDave Airlie <airlied@redhat.com>2014-09-24 03:42:36 +0200
commit9908fb654088e50d7d528f74898c5e5ebbd0fb68 (patch)
tree14f640b5845f72ad31cfc04abeccbe2ff3c72e3e
parentdrm/ttm: Clean usage of ttm_io_prot() with TTM_PL_FLAG_CACHED (diff)
downloadlinux-9908fb654088e50d7d528f74898c5e5ebbd0fb68.tar.xz
linux-9908fb654088e50d7d528f74898c5e5ebbd0fb68.zip
drm: change drm_err return type to void
The return value is not used by callers of this function nor by uses of the DRM_ERROR macro so change the function to return void. Signed-off-by: Joe Perches <joe@perches.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_drv.c7
-rw-r--r--include/drm/drmP.h2
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 6a119026a76b..8889f8ec50ab 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -56,22 +56,19 @@ static struct idr drm_minors_idr;
struct class *drm_class;
static struct dentry *drm_debugfs_root;
-int drm_err(const char *func, const char *format, ...)
+void drm_err(const char *func, const char *format, ...)
{
struct va_format vaf;
va_list args;
- int r;
va_start(args, format);
vaf.fmt = format;
vaf.va = &args;
- r = printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* %pV", func, &vaf);
+ printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* %pV", func, &vaf);
va_end(args);
-
- return r;
}
EXPORT_SYMBOL(drm_err);
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 5c60d384b37b..2163ccbee50f 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -124,7 +124,7 @@ extern __printf(2, 3)
void drm_ut_debug_printk(const char *function_name,
const char *format, ...);
extern __printf(2, 3)
-int drm_err(const char *func, const char *format, ...);
+void drm_err(const char *func, const char *format, ...);
/***********************************************************************/
/** \name DRM template customization defaults */