Merge tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / msm_rd.c

diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
index 6f634e6..76d3fdd 100644 (file)
--- a/drivers/gpu/drm/msm/msm_rd.c
+++ b/drivers/gpu/drm/msm/msm_rd.c
@@ -233,8 +233,6 @@ static void rd_cleanup(struct msm_rd_state *rd)
 static struct msm_rd_state *rd_init(struct drm_minor *minor, const char *name)
 {
        struct msm_rd_state *rd;
-       struct dentry *ent;
-       int ret = 0;
 
        rd = kzalloc(sizeof(*rd), GFP_KERNEL);
        if (!rd)
@@ -247,20 +245,10 @@ static struct msm_rd_state *rd_init(struct drm_minor *minor, const char *name)
 
        init_waitqueue_head(&rd->fifo_event);
 
-       ent = debugfs_create_file(name, S_IFREG | S_IRUGO,
-                       minor->debugfs_root, rd, &rd_debugfs_fops);
-       if (!ent) {
-               DRM_ERROR("Cannot create /sys/kernel/debug/dri/%pd/%s\n",
-                               minor->debugfs_root, name);
-               ret = -ENOMEM;
-               goto fail;
-       }
+       debugfs_create_file(name, S_IFREG | S_IRUGO, minor->debugfs_root, rd,
+                           &rd_debugfs_fops);
 
        return rd;
-
-fail:
-       rd_cleanup(rd);
-       return ERR_PTR(ret);
 }
 
 int msm_rd_debugfs_init(struct drm_minor *minor)