Commit 39896c52 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: use drm->debugfs_root for creating debugfs files 



Since commit 0b30d57a ("drm/debugfs: rework debugfs directory
creation v5") we should be using drm->debugfs_root instead of
minor->debugfs_root for creating debugfs files.

As a rule of thumb, use a local variable when there are two or more
uses, otherwise just have the single reference inline.

Drop drm/drm_file.h include where possible.

Reviewed-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/e8268546ec2a2941a3dc43c2fdc60f678dc03fce.1753782998.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent b5de222c

drivers/gpu/drm/i915/display/intel_bios.c

+1 −3
Original line number Diff line number Diff line
@@ -3744,8 +3744,6 @@ DEFINE_SHOW_ATTRIBUTE(intel_bios_vbt); 


void intel_bios_debugfs_register(struct intel_display *display)

{

	struct drm_minor *minor = display->drm->primary;



	debugfs_create_file("i915_vbt", 0444, minor->debugfs_root,

	debugfs_create_file("i915_vbt", 0444, display->drm->debugfs_root,

			    display, &intel_bios_vbt_fops);

}

drivers/gpu/drm/i915/display/intel_cdclk.c

+1 −3
Original line number Diff line number Diff line
@@ -3627,9 +3627,7 @@ DEFINE_SHOW_ATTRIBUTE(i915_cdclk_info); 


void intel_cdclk_debugfs_register(struct intel_display *display)

{

	struct drm_minor *minor = display->drm->primary;



	debugfs_create_file("i915_cdclk_info", 0444, minor->debugfs_root,

	debugfs_create_file("i915_cdclk_info", 0444, display->drm->debugfs_root,

			    display, &i915_cdclk_info_fops);

}

drivers/gpu/drm/i915/display/intel_display_debugfs.c

+3 −3
Original line number Diff line number Diff line
@@ -820,14 +820,14 @@ static const struct drm_info_list intel_display_debugfs_list[] = { 


void intel_display_debugfs_register(struct intel_display *display)

{

	struct drm_minor *minor = display->drm->primary;

	struct dentry *debugfs_root = display->drm->debugfs_root;



	debugfs_create_file("i915_fifo_underrun_reset", 0644, minor->debugfs_root,

	debugfs_create_file("i915_fifo_underrun_reset", 0644, debugfs_root,

			    display, &i915_fifo_underrun_reset_ops);



	drm_debugfs_create_files(intel_display_debugfs_list,

				 ARRAY_SIZE(intel_display_debugfs_list),

				 minor->debugfs_root, minor);

				 debugfs_root, display->drm->primary);



	intel_bios_debugfs_register(display);

	intel_cdclk_debugfs_register(display);

drivers/gpu/drm/i915/display/intel_display_debugfs_params.c

+3 −4
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/kernel.h>



#include <drm/drm_drv.h>

#include <drm/drm_file.h>



#include "intel_display_core.h"

#include "intel_display_debugfs_params.h"
@@ -154,14 +153,14 @@ intel_display_debugfs_create_uint(const char *name, umode_t mode, 
/* add a subdirectory with files for each intel display param */

void intel_display_debugfs_params(struct intel_display *display)

{

	struct drm_minor *minor = display->drm->primary;

	struct dentry *debugfs_root = display->drm->debugfs_root;

	struct dentry *dir;

	char dirname[16];



	snprintf(dirname, sizeof(dirname), "%s_params", display->drm->driver->name);

	dir = debugfs_lookup(dirname, minor->debugfs_root);

	dir = debugfs_lookup(dirname, debugfs_root);

	if (!dir)

		dir = debugfs_create_dir(dirname, minor->debugfs_root);

		dir = debugfs_create_dir(dirname, debugfs_root);

	if (IS_ERR(dir))

		return;

drivers/gpu/drm/i915/display/intel_dmc.c

+1 −3
Original line number Diff line number Diff line
@@ -1603,9 +1603,7 @@ DEFINE_SHOW_ATTRIBUTE(intel_dmc_debugfs_status); 


void intel_dmc_debugfs_register(struct intel_display *display)

{

	struct drm_minor *minor = display->drm->primary;



	debugfs_create_file("i915_dmc_info", 0444, minor->debugfs_root,

	debugfs_create_file("i915_dmc_info", 0444, display->drm->debugfs_root,

			    display, &intel_dmc_debugfs_status_fops);

}