From 1b0c7b48409c7faf241813bbf24588f3d676208f Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Wed, 28 May 2014 13:46:12 +0200 Subject: [PATCH] drm/tegra: sor - Make debugfs setup consistent Other output drivers set up debugfs slightly differently. Bring the SOR driver in line with those for consistency. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/sor.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 06f800917738..93ae4fac8ac2 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -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); } -- 2.20.1