ALSA: scarlett2: Simplify enums by removing explicit values

This commit removes the explicit integer assignments from the enums.
The actual values matter little, and not assigning explicit values
makes it easier to modify the longer lists in the future.

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/67f0f1bb8b90d7c76dfe7062d22d33bbde19cf93.1703444932.git.g@b4.vu
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/mixer_scarlett2.c b/sound/usb/mixer_scarlett2.c
index 6a9e8e2e246f795b2af9681cc5b08ed80a4bc02a..6e044b63ec9134015f17b89d70e0f4c9ef849714 100644 (file)
--- a/sound/usb/mixer_scarlett2.c
+++ b/sound/usb/mixer_scarlett2.c
@@ -223,11 +223,11 @@ static const u16 scarlett2_mixer_values[SCARLETT2_MIXER_VALUE_COUNT] = {
  * devices, dependent on series and model.
  */
 enum {
-       SCARLETT2_CONFIG_SET_GEN_2   = 0,
-       SCARLETT2_CONFIG_SET_GEN_3A  = 1,
-       SCARLETT2_CONFIG_SET_GEN_3B  = 2,
-       SCARLETT2_CONFIG_SET_CLARETT = 3,
-       SCARLETT2_CONFIG_SET_COUNT   = 4
+       SCARLETT2_CONFIG_SET_GEN_2,
+       SCARLETT2_CONFIG_SET_GEN_3A,
+       SCARLETT2_CONFIG_SET_GEN_3B,
+       SCARLETT2_CONFIG_SET_CLARETT,
+       SCARLETT2_CONFIG_SET_COUNT
 };
 
 /* Hardware port types:
@@ -239,35 +239,35 @@ enum {
  * - PCM I/O
  */
 enum {
-       SCARLETT2_PORT_TYPE_NONE     = 0,
-       SCARLETT2_PORT_TYPE_ANALOGUE = 1,
-       SCARLETT2_PORT_TYPE_SPDIF    = 2,
-       SCARLETT2_PORT_TYPE_ADAT     = 3,
-       SCARLETT2_PORT_TYPE_MIX      = 4,
-       SCARLETT2_PORT_TYPE_PCM      = 5,
-       SCARLETT2_PORT_TYPE_COUNT    = 6,
+       SCARLETT2_PORT_TYPE_NONE,
+       SCARLETT2_PORT_TYPE_ANALOGUE,
+       SCARLETT2_PORT_TYPE_SPDIF,
+       SCARLETT2_PORT_TYPE_ADAT,
+       SCARLETT2_PORT_TYPE_MIX,
+       SCARLETT2_PORT_TYPE_PCM,
+       SCARLETT2_PORT_TYPE_COUNT
 };
 
 /* I/O count of each port type kept in struct scarlett2_ports */
 enum {
-       SCARLETT2_PORT_IN    = 0,
-       SCARLETT2_PORT_OUT   = 1,
-       SCARLETT2_PORT_DIRNS = 2,
+       SCARLETT2_PORT_IN,
+       SCARLETT2_PORT_OUT,
+       SCARLETT2_PORT_DIRNS
 };
 
 /* Dim/Mute buttons on the 18i20 */
 enum {
-       SCARLETT2_BUTTON_MUTE    = 0,
-       SCARLETT2_BUTTON_DIM     = 1,
-       SCARLETT2_DIM_MUTE_COUNT = 2,
+       SCARLETT2_BUTTON_MUTE,
+       SCARLETT2_BUTTON_DIM,
+       SCARLETT2_DIM_MUTE_COUNT
 };
 
 /* Flash Write State */
 enum {
-       SCARLETT2_FLASH_WRITE_STATE_IDLE = 0,
-       SCARLETT2_FLASH_WRITE_STATE_SELECTED = 1,
-       SCARLETT2_FLASH_WRITE_STATE_ERASING = 2,
-       SCARLETT2_FLASH_WRITE_STATE_WRITE = 3
+       SCARLETT2_FLASH_WRITE_STATE_IDLE,
+       SCARLETT2_FLASH_WRITE_STATE_SELECTED,
+       SCARLETT2_FLASH_WRITE_STATE_ERASING,
+       SCARLETT2_FLASH_WRITE_STATE_WRITE
 };
 
 static const char *const scarlett2_dim_mute_names[SCARLETT2_DIM_MUTE_COUNT] = {
@@ -1211,22 +1211,22 @@ struct scarlett2_usb_volume_status {
 
 /* Configuration parameters that can be read and written */
 enum {
-       SCARLETT2_CONFIG_DIM_MUTE = 0,
-       SCARLETT2_CONFIG_LINE_OUT_VOLUME = 1,
-       SCARLETT2_CONFIG_MUTE_SWITCH = 2,
-       SCARLETT2_CONFIG_SW_HW_SWITCH = 3,
-       SCARLETT2_CONFIG_LEVEL_SWITCH = 4,
-       SCARLETT2_CONFIG_PAD_SWITCH = 5,
-       SCARLETT2_CONFIG_MSD_SWITCH = 6,
-       SCARLETT2_CONFIG_AIR_SWITCH = 7,
-       SCARLETT2_CONFIG_STANDALONE_SWITCH = 8,
-       SCARLETT2_CONFIG_PHANTOM_SWITCH = 9,
-       SCARLETT2_CONFIG_PHANTOM_PERSISTENCE = 10,
-       SCARLETT2_CONFIG_DIRECT_MONITOR = 11,
-       SCARLETT2_CONFIG_MONITOR_OTHER_SWITCH = 12,
-       SCARLETT2_CONFIG_MONITOR_OTHER_ENABLE = 13,
-       SCARLETT2_CONFIG_TALKBACK_MAP = 14,
-       SCARLETT2_CONFIG_COUNT = 15
+       SCARLETT2_CONFIG_DIM_MUTE,
+       SCARLETT2_CONFIG_LINE_OUT_VOLUME,
+       SCARLETT2_CONFIG_MUTE_SWITCH,
+       SCARLETT2_CONFIG_SW_HW_SWITCH,
+       SCARLETT2_CONFIG_LEVEL_SWITCH,
+       SCARLETT2_CONFIG_PAD_SWITCH,
+       SCARLETT2_CONFIG_MSD_SWITCH,
+       SCARLETT2_CONFIG_AIR_SWITCH,
+       SCARLETT2_CONFIG_STANDALONE_SWITCH,
+       SCARLETT2_CONFIG_PHANTOM_SWITCH,
+       SCARLETT2_CONFIG_PHANTOM_PERSISTENCE,
+       SCARLETT2_CONFIG_DIRECT_MONITOR,
+       SCARLETT2_CONFIG_MONITOR_OTHER_SWITCH,
+       SCARLETT2_CONFIG_MONITOR_OTHER_ENABLE,
+       SCARLETT2_CONFIG_TALKBACK_MAP,
+       SCARLETT2_CONFIG_COUNT
 };
 
 /* Location, size, and activation command number for the configuration