[PATCH 27/30] drm/sti/sti_hdmi: Move 'colorspace_mode_names' array to where its used

From: Lee Jones
Date: Thu Nov 12 2020 - 14:02:09 EST


Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/sti/sti_hdmi.h:36:40: warning: ‘colorspace_mode_names’ defined but not used [-Wunused-const-variable=]
36 | static const struct drm_prop_enum_list colorspace_mode_names[] = {
| ^~~~~~~~~~~~~~~~~~~~~

Cc: Benjamin Gaignard <benjamin.gaignard@xxxxxxxxxx>
Cc: Vincent Abriou <vincent.abriou@xxxxxx>
Cc: David Airlie <airlied@xxxxxxxx>
Cc: Daniel Vetter <daniel@xxxxxxxx>
Cc: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
---
drivers/gpu/drm/sti/sti_hdmi.c | 6 ++++++
drivers/gpu/drm/sti/sti_hdmi.h | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 38a558768e531..f3ace11209dd7 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -167,6 +167,12 @@ struct sti_hdmi_connector {
#define to_sti_hdmi_connector(x) \
container_of(x, struct sti_hdmi_connector, drm_connector)

+static const struct drm_prop_enum_list colorspace_mode_names[] = {
+ { HDMI_COLORSPACE_RGB, "rgb" },
+ { HDMI_COLORSPACE_YUV422, "yuv422" },
+ { HDMI_COLORSPACE_YUV444, "yuv444" },
+};
+
u32 hdmi_read(struct sti_hdmi *hdmi, int offset)
{
return readl(hdmi->regs + offset);
diff --git a/drivers/gpu/drm/sti/sti_hdmi.h b/drivers/gpu/drm/sti/sti_hdmi.h
index 1f6dc90b5d83a..05b2f3d0d48d3 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.h
+++ b/drivers/gpu/drm/sti/sti_hdmi.h
@@ -33,12 +33,6 @@ struct hdmi_audio_params {
struct hdmi_audio_infoframe cea;
};

-static const struct drm_prop_enum_list colorspace_mode_names[] = {
- { HDMI_COLORSPACE_RGB, "rgb" },
- { HDMI_COLORSPACE_YUV422, "yuv422" },
- { HDMI_COLORSPACE_YUV444, "yuv444" },
-};
-
#define DEFAULT_COLORSPACE_MODE HDMI_COLORSPACE_RGB

/**
--
2.25.1