1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index bc3da32d4585..4f41377b0b80 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -56,7 +56,7 @@ static struct idr drm_minors_idr;
 struct class *drm_class;
 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;
         va_list args;
@@ -66,7 +66,8 @@ void drm_err(const char *func, const char *format, ...)
         vaf.fmt = format;
         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);
 }
@@ -534,6 +535,8 @@ static void drm_fs_inode_free(struct inode *inode)
  * The initial ref-count of the object is 1. Use drm_dev_ref() and
  * drm_dev_unref() to take and drop further ref-counts.
  *
+ * Note that for purely virtual devices @parent can be NULL.
+ *
  * RETURNS:
  * Pointer to new DRM device, or NULL if out of memory.
  */