drm/i915/gmbus: move GPIO enum to gmbus

The GPIO enum is only used in intel_gmbus.c, hide it there.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/3c386ce08d7d53a45c14c2e7519e4cc78a8161be.1667383630.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 918c8f432172b4aa23d4612656e9dc3506c43de8..3cc85ef3b111dbb477cf7d6c74ec65633442d456 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -61,24 +61,6 @@ struct intel_remapped_info;
 struct intel_rotation_info;
 struct pci_dev;
 
-enum i915_gpio {
-       GPIOA,
-       GPIOB,
-       GPIOC,
-       GPIOD,
-       GPIOE,
-       GPIOF,
-       GPIOG,
-       GPIOH,
-       __GPIOI_UNUSED,
-       GPIOJ,
-       GPIOK,
-       GPIOL,
-       GPIOM,
-       GPION,
-       GPIOO,
-};
-
 /*
  * Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the
  * rest have consecutive values and match the enum values of transcoders

diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
index 74443f57f62dfe3530dc17df6437dc2e9f4159b5..860e0f8b6b19f8b61aa9ae04c51cddd9d5aa1467 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_gmbus.c
+++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
@@ -49,9 +49,27 @@ struct intel_gmbus {
        struct drm_i915_private *i915;
 };
 
+enum gmbus_gpio {
+       GPIOA,
+       GPIOB,
+       GPIOC,
+       GPIOD,
+       GPIOE,
+       GPIOF,
+       GPIOG,
+       GPIOH,
+       __GPIOI_UNUSED,
+       GPIOJ,
+       GPIOK,
+       GPIOL,
+       GPIOM,
+       GPION,
+       GPIOO,
+};
+
 struct gmbus_pin {
        const char *name;
-       enum i915_gpio gpio;
+       enum gmbus_gpio gpio;
 };
 
 /* Map gmbus pin pairs to names and registers. */