[Intel-gfx] [PATCH 3/4] drm: Kill drm_display_info.name

Daniel Vetter daniel at ffwll.ch
Tue Mar 26 18:11:23 UTC 2019


On Tue, Mar 26, 2019 at 07:34:00PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> drm_display_info.name is only ever set by a few panel drveirs but
> never actually used anywhere except in i915 debugfs code. Trash it.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Huh, nice find.

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/i915/i915_debugfs.c                | 1 -
>  drivers/gpu/drm/panel/panel-arm-versatile.c        | 2 --
>  drivers/gpu/drm/panel/panel-ilitek-ili9322.c       | 2 --
>  drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 1 -
>  drivers/gpu/drm/panel/panel-samsung-s6d16d0.c      | 3 ---
>  drivers/gpu/drm/panel/panel-tpo-tpg110.c           | 2 --
>  include/drm/drm_connector.h                        | 5 -----
>  7 files changed, 16 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 47bf07a59b5e..933228443b96 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2866,7 +2866,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 078fa2c0eef8..a79908dfa3c8 100644
> --- 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 35497ff08391..a1c4cd2940fb 100644
> --- 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 5e8d4523e9ed..a1d8d92fac2b 100644
> --- 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 33c22ee036f8..f75bef24e050 100644
> --- 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 25f00cfc1af4..71591e5f5938 100644
> --- 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 c5bff7518ec5..02a131202add 100644
> --- a/include/drm/drm_connector.h
> +++ b/include/drm/drm_connector.h
> @@ -355,11 +355,6 @@ enum drm_bus_flags {
>   * 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.
>  	 */
> -- 
> 2.19.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the Intel-gfx mailing list