[Intel-gfx] [PATCH 2/6] drm/i915/sdvo: Use named initializers for the SDVO command names

Chris Wilson chris at chris-wilson.co.uk
Wed Jun 19 18:08:31 UTC 2019


Quoting Ville Syrjala (2019-06-19 19:03:08)
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Use named initializers to make it easier to associate the SDVO debug
> prints with the SDVO command defines. Also switch to using ARRAY_SIZE()
> instead of assuming that SDVO_CMD_STATUS_SCALING_NOT_SUPP is the last
> command type.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_sdvo.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index 681411aae754..fb77176b9a8c 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -429,13 +429,13 @@ static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd,
>  }
>  
>  static const char * const cmd_status_names[] = {
> -       "Power on",
> -       "Success",
> -       "Not supported",
> -       "Invalid arg",
> -       "Pending",
> -       "Target not specified",
> -       "Scaling not supported"
> +       [SDVO_CMD_STATUS_POWER_ON] = "Power on",
> +       [SDVO_CMD_STATUS_SUCCESS] = "Success",
> +       [SDVO_CMD_STATUS_NOTSUPP] = "Not supported",
> +       [SDVO_CMD_STATUS_INVALID_ARG] = "Invalid arg",
> +       [SDVO_CMD_STATUS_PENDING] = "Pending",
> +       [SDVO_CMD_STATUS_TARGET_NOT_SPECIFIED] = "Target not specified",
> +       [SDVO_CMD_STATUS_SCALING_NOT_SUPP] = "Scaling not supported",
>  };
>  
>  static bool __intel_sdvo_write_cmd(struct intel_sdvo *intel_sdvo, u8 cmd,
> @@ -562,7 +562,7 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
>  #define BUF_PRINT(args...) \
>         pos += snprintf(buffer + pos, max_t(int, BUF_LEN - pos, 0), args)
>  
> -       if (status <= SDVO_CMD_STATUS_SCALING_NOT_SUPP)
> +       if (status < ARRAY_SIZE(cmd_status_names))

And might as well be defensive (strings vs HW vs dev),
	if (status < ARRAY_SIZE(cmd_status_names) &&
	    cmd_status_names[status]))

Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris


More information about the Intel-gfx mailing list