drm/tegra: sor - Make debugfs setup consistent
authorThierry Reding <treding@nvidia.com>
Wed, 28 May 2014 11:46:12 +0000 (13:46 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 6 Jun 2014 06:38:31 +0000 (08:38 +0200)
Other output drivers set up debugfs slightly differently. Bring the SOR
driver in line with those for consistency.

Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/drm/tegra/sor.c

index 06f80091773818ec6ee9b4c7332da9d34999bf06..93ae4fac8ac22ca7d184ebc3877cca56c4d91466 100644 (file)
@@ -1007,12 +1007,13 @@ static const struct file_operations tegra_sor_crc_fops = {
        .release = tegra_sor_crc_release,
 };
 
-static int tegra_sor_debugfs_init(struct tegra_sor *sor, struct dentry *root)
+static int tegra_sor_debugfs_init(struct tegra_sor *sor,
+                                 struct drm_minor *minor)
 {
        struct dentry *entry;
        int err = 0;
 
-       sor->debugfs = debugfs_create_dir("sor", root);
+       sor->debugfs = debugfs_create_dir("sor", minor->debugfs_root);
        if (!sor->debugfs)
                return -ENOMEM;
 
@@ -1021,7 +1022,7 @@ static int tegra_sor_debugfs_init(struct tegra_sor *sor, struct dentry *root)
        if (!entry) {
                dev_err(sor->dev,
                        "cannot create /sys/kernel/debug/dri/%s/sor/crc\n",
-                       root->d_name.name);
+                       minor->debugfs_root->d_name.name);
                err = -ENOMEM;
                goto remove;
        }
@@ -1063,9 +1064,7 @@ static int tegra_sor_init(struct host1x_client *client)
        }
 
        if (IS_ENABLED(CONFIG_DEBUG_FS)) {
-               struct dentry *root = drm->primary->debugfs_root;
-
-               err = tegra_sor_debugfs_init(sor, root);
+               err = tegra_sor_debugfs_init(sor, drm->primary);
                if (err < 0)
                        dev_err(sor->dev, "debugfs setup failed: %d\n", err);
        }