drm: Kill drm_display_info.name

drm_display_info.name is only ever set by a few panel drivers but
never actually used anywhere except in i915 debugfs code. Trash it.

v2: Fix typo in commit msg (Sam Ravnborg)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190326173401.7329-3-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 0bd890c04fe4f7c911bd9bde1a79af11af08ff5c..852ff74ef76de4e3941b4e7efea5ff27171592d7 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2904,7 +2904,6 @@ static void intel_connector_info(struct seq_file *m,
        if (connector->status == connector_status_disconnected)
                return;
 
-       seq_printf(m, "\tname: %s\n", connector->display_info.name);
        seq_printf(m, "\tphysical dimensions: %dx%dmm\n",
                   connector->display_info.width_mm,
                   connector->display_info.height_mm);

diff --git a/drivers/gpu/drm/panel/panel-arm-versatile.c b/drivers/gpu/drm/panel/panel-arm-versatile.c
index b428c467810674f1e0367d6699f97298465344c7..72ce50581ef4696c32266ccaf32cbb08f5ece3ab 100644 (file)
--- a/drivers/gpu/drm/panel/panel-arm-versatile.c
+++ b/drivers/gpu/drm/panel/panel-arm-versatile.c
@@ -264,8 +264,6 @@ static int versatile_panel_get_modes(struct drm_panel *panel)
        struct versatile_panel *vpanel = to_versatile_panel(panel);
        struct drm_display_mode *mode;
 
-       strncpy(connector->display_info.name, vpanel->panel_type->name,
-               DRM_DISPLAY_INFO_LEN);
        connector->display_info.width_mm = vpanel->panel_type->width_mm;
        connector->display_info.height_mm = vpanel->panel_type->height_mm;
        connector->display_info.bus_flags = vpanel->panel_type->bus_flags;

diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
index bd38bf4f1ba6450c6dd63035cda7943e08377a6b..6126735c2a78625d5ef7b55d5a8f957bfdbb9d17 100644 (file)
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
@@ -662,8 +662,6 @@ static int ili9322_get_modes(struct drm_panel *panel)
        struct ili9322 *ili = panel_to_ili9322(panel);
        struct drm_display_mode *mode;
 
-       strncpy(connector->display_info.name, "ILI9322 TFT LCD driver\0",
-               DRM_DISPLAY_INFO_LEN);
        connector->display_info.width_mm = ili->conf->width_mm;
        connector->display_info.height_mm = ili->conf->height_mm;
 

diff --git a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
index 5e8d4523e9ede7124ffa837d94f9794275c1c442..a1d8d92fac2b1f72db997110aadd3855c684bcab 100644 (file)
--- a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
+++ b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
@@ -190,7 +190,6 @@ static int lcd_olinuxino_get_modes(struct drm_panel *panel)
                num++;
        }
 
-       memcpy(connector->display_info.name, lcd_info->name, 32);
        connector->display_info.width_mm = lcd_info->width_mm;
        connector->display_info.height_mm = lcd_info->height_mm;
        connector->display_info.bpc = lcd_info->bpc;

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c b/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
index 33c22ee036f8030999dbbf77ee7ced2b7e2ddc63..f75bef24e0504664c96b9c0d2534b94554baad4d 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
@@ -148,9 +148,6 @@ static int s6d16d0_get_modes(struct drm_panel *panel)
        struct drm_connector *connector = panel->connector;
        struct drm_display_mode *mode;
 
-       strncpy(connector->display_info.name, "Samsung S6D16D0\0",
-               DRM_DISPLAY_INFO_LEN);
-
        mode = drm_mode_duplicate(panel->drm, &samsung_s6d16d0_mode);
        if (!mode) {
                DRM_ERROR("bad mode or failed to add mode\n");

diff --git a/drivers/gpu/drm/panel/panel-tpo-tpg110.c b/drivers/gpu/drm/panel/panel-tpo-tpg110.c
index 5a9f8f4d5d24d29cef85001d0f3f608b5d3e0753..36b9e8d6b9899a9f7b621eacf1a7706a94851976 100644 (file)
--- a/drivers/gpu/drm/panel/panel-tpo-tpg110.c
+++ b/drivers/gpu/drm/panel/panel-tpo-tpg110.c
@@ -390,8 +390,6 @@ static int tpg110_get_modes(struct drm_panel *panel)
        struct tpg110 *tpg = to_tpg110(panel);
        struct drm_display_mode *mode;
 
-       strncpy(connector->display_info.name, tpg->panel_mode->name,
-               DRM_DISPLAY_INFO_LEN);
        connector->display_info.width_mm = tpg->width;
        connector->display_info.height_mm = tpg->height;
        connector->display_info.bus_flags = tpg->panel_mode->bus_flags;

diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index b78a2ad662986de825b046dce123fcb4b5addee5..ba255f5a0625004e3800d467933342f2b1ee77f5 100644 (file)
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -293,11 +293,6 @@ enum drm_panel_orientation {
  * drm_add_edid_modes().
  */
 struct drm_display_info {
-       /**
-        * @name: Name of the display.
-        */
-       char name[DRM_DISPLAY_INFO_LEN];
-
        /**
         * @width_mm: Physical width in mm.
         */