drm/i915/sdvo: Shrink sdvo_cmd_names[] strings

Drop the redundant "SDVO_CMD_" prefix from the command name
strings in sdvo_cmd_names[].

While at it throw away the unused struct name, and undef
SDVO_CMD_NAME_ENTRY() when we're done.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190619180312.31817-4-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index b3d51d7c076fa5905b347e61018a645a85c75a70..bde11c03cd5a322b0d402fa540c86e7df7512cfe 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -274,124 +274,127 @@ static bool intel_sdvo_read_byte(struct intel_sdvo *intel_sdvo, u8 addr, u8 *ch)
        return false;
 }
 
-#define SDVO_CMD_NAME_ENTRY(cmd) {cmd, #cmd}
+#define SDVO_CMD_NAME_ENTRY(cmd_) { .cmd = SDVO_CMD_ ## cmd_, .name = #cmd_ }
+
 /** Mapping of command numbers to names, for debug output */
-static const struct _sdvo_cmd_name {
+static const struct {
        u8 cmd;
        const char *name;
 } __attribute__ ((packed)) sdvo_cmd_names[] = {
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_RESET),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_DEVICE_CAPS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FIRMWARE_REV),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TRAINED_INPUTS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ACTIVE_OUTPUTS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ACTIVE_OUTPUTS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_IN_OUT_MAP),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_IN_OUT_MAP),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ATTACHED_DISPLAYS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HOT_PLUG_SUPPORT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ACTIVE_HOT_PLUG),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ACTIVE_HOT_PLUG),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INTERRUPT_EVENT_SOURCE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TARGET_INPUT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TARGET_OUTPUT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INPUT_TIMINGS_PART1),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INPUT_TIMINGS_PART2),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_INPUT_TIMINGS_PART1),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_INPUT_TIMINGS_PART2),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OUTPUT_TIMINGS_PART1),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OUTPUT_TIMINGS_PART2),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OUTPUT_TIMINGS_PART1),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OUTPUT_TIMINGS_PART2),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART1),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART2),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INPUT_PIXEL_CLOCK_RANGE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OUTPUT_PIXEL_CLOCK_RANGE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_CLOCK_RATE_MULTS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_CLOCK_RATE_MULT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CLOCK_RATE_MULT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_TV_FORMATS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_FORMAT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_FORMAT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_POWER_STATES),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_POWER_STATE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ENCODER_POWER_STATE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_DISPLAY_POWER_STATE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CONTROL_BUS_SWITCH),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SCALED_HDTV_RESOLUTION_SUPPORT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS),
+       SDVO_CMD_NAME_ENTRY(RESET),
+       SDVO_CMD_NAME_ENTRY(GET_DEVICE_CAPS),
+       SDVO_CMD_NAME_ENTRY(GET_FIRMWARE_REV),
+       SDVO_CMD_NAME_ENTRY(GET_TRAINED_INPUTS),
+       SDVO_CMD_NAME_ENTRY(GET_ACTIVE_OUTPUTS),
+       SDVO_CMD_NAME_ENTRY(SET_ACTIVE_OUTPUTS),
+       SDVO_CMD_NAME_ENTRY(GET_IN_OUT_MAP),
+       SDVO_CMD_NAME_ENTRY(SET_IN_OUT_MAP),
+       SDVO_CMD_NAME_ENTRY(GET_ATTACHED_DISPLAYS),
+       SDVO_CMD_NAME_ENTRY(GET_HOT_PLUG_SUPPORT),
+       SDVO_CMD_NAME_ENTRY(SET_ACTIVE_HOT_PLUG),
+       SDVO_CMD_NAME_ENTRY(GET_ACTIVE_HOT_PLUG),
+       SDVO_CMD_NAME_ENTRY(GET_INTERRUPT_EVENT_SOURCE),
+       SDVO_CMD_NAME_ENTRY(SET_TARGET_INPUT),
+       SDVO_CMD_NAME_ENTRY(SET_TARGET_OUTPUT),
+       SDVO_CMD_NAME_ENTRY(GET_INPUT_TIMINGS_PART1),
+       SDVO_CMD_NAME_ENTRY(GET_INPUT_TIMINGS_PART2),
+       SDVO_CMD_NAME_ENTRY(SET_INPUT_TIMINGS_PART1),
+       SDVO_CMD_NAME_ENTRY(SET_INPUT_TIMINGS_PART2),
+       SDVO_CMD_NAME_ENTRY(SET_OUTPUT_TIMINGS_PART1),
+       SDVO_CMD_NAME_ENTRY(SET_OUTPUT_TIMINGS_PART2),
+       SDVO_CMD_NAME_ENTRY(GET_OUTPUT_TIMINGS_PART1),
+       SDVO_CMD_NAME_ENTRY(GET_OUTPUT_TIMINGS_PART2),
+       SDVO_CMD_NAME_ENTRY(CREATE_PREFERRED_INPUT_TIMING),
+       SDVO_CMD_NAME_ENTRY(GET_PREFERRED_INPUT_TIMING_PART1),
+       SDVO_CMD_NAME_ENTRY(GET_PREFERRED_INPUT_TIMING_PART2),
+       SDVO_CMD_NAME_ENTRY(GET_INPUT_PIXEL_CLOCK_RANGE),
+       SDVO_CMD_NAME_ENTRY(GET_OUTPUT_PIXEL_CLOCK_RANGE),
+       SDVO_CMD_NAME_ENTRY(GET_SUPPORTED_CLOCK_RATE_MULTS),
+       SDVO_CMD_NAME_ENTRY(GET_CLOCK_RATE_MULT),
+       SDVO_CMD_NAME_ENTRY(SET_CLOCK_RATE_MULT),
+       SDVO_CMD_NAME_ENTRY(GET_SUPPORTED_TV_FORMATS),
+       SDVO_CMD_NAME_ENTRY(GET_TV_FORMAT),
+       SDVO_CMD_NAME_ENTRY(SET_TV_FORMAT),
+       SDVO_CMD_NAME_ENTRY(GET_SUPPORTED_POWER_STATES),
+       SDVO_CMD_NAME_ENTRY(GET_POWER_STATE),
+       SDVO_CMD_NAME_ENTRY(SET_ENCODER_POWER_STATE),
+       SDVO_CMD_NAME_ENTRY(SET_DISPLAY_POWER_STATE),
+       SDVO_CMD_NAME_ENTRY(SET_CONTROL_BUS_SWITCH),
+       SDVO_CMD_NAME_ENTRY(GET_SDTV_RESOLUTION_SUPPORT),
+       SDVO_CMD_NAME_ENTRY(GET_SCALED_HDTV_RESOLUTION_SUPPORT),
+       SDVO_CMD_NAME_ENTRY(GET_SUPPORTED_ENHANCEMENTS),
 
        /* Add the op code for SDVO enhancements */
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_HPOS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HPOS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HPOS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_VPOS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_VPOS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_VPOS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_SATURATION),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SATURATION),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_SATURATION),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_HUE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HUE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HUE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_CONTRAST),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_CONTRAST),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CONTRAST),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_BRIGHTNESS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_BRIGHTNESS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_BRIGHTNESS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_OVERSCAN_H),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OVERSCAN_H),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OVERSCAN_H),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_OVERSCAN_V),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OVERSCAN_V),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OVERSCAN_V),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER_ADAPTIVE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER_ADAPTIVE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER_ADAPTIVE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER_2D),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER_2D),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER_2D),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_SHARPNESS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SHARPNESS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_SHARPNESS),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_DOT_CRAWL),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_DOT_CRAWL),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_TV_CHROMA_FILTER),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_CHROMA_FILTER),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_CHROMA_FILTER),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_TV_LUMA_FILTER),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_LUMA_FILTER),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_LUMA_FILTER),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_HPOS),
+       SDVO_CMD_NAME_ENTRY(GET_HPOS),
+       SDVO_CMD_NAME_ENTRY(SET_HPOS),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_VPOS),
+       SDVO_CMD_NAME_ENTRY(GET_VPOS),
+       SDVO_CMD_NAME_ENTRY(SET_VPOS),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_SATURATION),
+       SDVO_CMD_NAME_ENTRY(GET_SATURATION),
+       SDVO_CMD_NAME_ENTRY(SET_SATURATION),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_HUE),
+       SDVO_CMD_NAME_ENTRY(GET_HUE),
+       SDVO_CMD_NAME_ENTRY(SET_HUE),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_CONTRAST),
+       SDVO_CMD_NAME_ENTRY(GET_CONTRAST),
+       SDVO_CMD_NAME_ENTRY(SET_CONTRAST),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_BRIGHTNESS),
+       SDVO_CMD_NAME_ENTRY(GET_BRIGHTNESS),
+       SDVO_CMD_NAME_ENTRY(SET_BRIGHTNESS),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_OVERSCAN_H),
+       SDVO_CMD_NAME_ENTRY(GET_OVERSCAN_H),
+       SDVO_CMD_NAME_ENTRY(SET_OVERSCAN_H),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_OVERSCAN_V),
+       SDVO_CMD_NAME_ENTRY(GET_OVERSCAN_V),
+       SDVO_CMD_NAME_ENTRY(SET_OVERSCAN_V),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_FLICKER_FILTER),
+       SDVO_CMD_NAME_ENTRY(GET_FLICKER_FILTER),
+       SDVO_CMD_NAME_ENTRY(SET_FLICKER_FILTER),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_FLICKER_FILTER_ADAPTIVE),
+       SDVO_CMD_NAME_ENTRY(GET_FLICKER_FILTER_ADAPTIVE),
+       SDVO_CMD_NAME_ENTRY(SET_FLICKER_FILTER_ADAPTIVE),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_FLICKER_FILTER_2D),
+       SDVO_CMD_NAME_ENTRY(GET_FLICKER_FILTER_2D),
+       SDVO_CMD_NAME_ENTRY(SET_FLICKER_FILTER_2D),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_SHARPNESS),
+       SDVO_CMD_NAME_ENTRY(GET_SHARPNESS),
+       SDVO_CMD_NAME_ENTRY(SET_SHARPNESS),
+       SDVO_CMD_NAME_ENTRY(GET_DOT_CRAWL),
+       SDVO_CMD_NAME_ENTRY(SET_DOT_CRAWL),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_TV_CHROMA_FILTER),
+       SDVO_CMD_NAME_ENTRY(GET_TV_CHROMA_FILTER),
+       SDVO_CMD_NAME_ENTRY(SET_TV_CHROMA_FILTER),
+       SDVO_CMD_NAME_ENTRY(GET_MAX_TV_LUMA_FILTER),
+       SDVO_CMD_NAME_ENTRY(GET_TV_LUMA_FILTER),
+       SDVO_CMD_NAME_ENTRY(SET_TV_LUMA_FILTER),
 
        /* HDMI op code */
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPP_ENCODE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ENCODE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ENCODE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_PIXEL_REPLI),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_PIXEL_REPLI),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_COLORIMETRY_CAP),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_COLORIMETRY),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_COLORIMETRY),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_AUDIO_ENCRYPT_PREFER),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_AUDIO_STAT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_AUDIO_STAT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_INDEX),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_INDEX),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_INFO),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_AV_SPLIT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_AV_SPLIT),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_TXRATE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_TXRATE),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_DATA),
-       SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_DATA),
+       SDVO_CMD_NAME_ENTRY(GET_SUPP_ENCODE),
+       SDVO_CMD_NAME_ENTRY(GET_ENCODE),
+       SDVO_CMD_NAME_ENTRY(SET_ENCODE),
+       SDVO_CMD_NAME_ENTRY(SET_PIXEL_REPLI),
+       SDVO_CMD_NAME_ENTRY(GET_PIXEL_REPLI),
+       SDVO_CMD_NAME_ENTRY(GET_COLORIMETRY_CAP),
+       SDVO_CMD_NAME_ENTRY(SET_COLORIMETRY),
+       SDVO_CMD_NAME_ENTRY(GET_COLORIMETRY),
+       SDVO_CMD_NAME_ENTRY(GET_AUDIO_ENCRYPT_PREFER),
+       SDVO_CMD_NAME_ENTRY(SET_AUDIO_STAT),
+       SDVO_CMD_NAME_ENTRY(GET_AUDIO_STAT),
+       SDVO_CMD_NAME_ENTRY(GET_HBUF_INDEX),
+       SDVO_CMD_NAME_ENTRY(SET_HBUF_INDEX),
+       SDVO_CMD_NAME_ENTRY(GET_HBUF_INFO),
+       SDVO_CMD_NAME_ENTRY(GET_HBUF_AV_SPLIT),
+       SDVO_CMD_NAME_ENTRY(SET_HBUF_AV_SPLIT),
+       SDVO_CMD_NAME_ENTRY(GET_HBUF_TXRATE),
+       SDVO_CMD_NAME_ENTRY(SET_HBUF_TXRATE),
+       SDVO_CMD_NAME_ENTRY(SET_HBUF_DATA),
+       SDVO_CMD_NAME_ENTRY(GET_HBUF_DATA),
 };
 
+#undef SDVO_CMD_NAME_ENTRY
+
 #define SDVO_NAME(svdo) ((svdo)->port == PORT_B ? "SDVOB" : "SDVOC")
 
 static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd,