ALSA: fireworks: fulfil device entries

All of devices with Echo Audio Fireworks board module has the same
combination of specifier_id (0x00a02d) and version (0x010000) in
unit directory.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210611093730.78254-3-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c
index 865dac3..ffb6dd7 100644 (file)
--- a/sound/firewire/fireworks/fireworks.c
+++ b/sound/firewire/fireworks/fireworks.c
@@ -300,6 +300,21 @@ static void efw_remove(struct fw_unit *unit)
        snd_card_free(efw->card);
 }
 
+#define SPECIFIER_1394TA       0x00a02d
+#define VERSION_EFW            0x010000
+
+#define SND_EFW_DEV_ENTRY(vendor, model) \
+{ \
+       .match_flags    = IEEE1394_MATCH_VENDOR_ID | \
+                         IEEE1394_MATCH_MODEL_ID | \
+                         IEEE1394_MATCH_SPECIFIER_ID | \
+                         IEEE1394_MATCH_VERSION, \
+       .vendor_id      = vendor,\
+       .model_id       = model, \
+       .specifier_id   = SPECIFIER_1394TA, \
+       .version        = VERSION_EFW, \
+}
+
 static const struct ieee1394_device_id efw_id_table[] = {
        SND_EFW_DEV_ENTRY(VENDOR_LOUD, MODEL_MACKIE_400F),
        SND_EFW_DEV_ENTRY(VENDOR_LOUD, MODEL_MACKIE_1200F),

diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h
index 2c0c7de..c8d5879 100644 (file)
--- a/sound/firewire/fireworks/fireworks.h
+++ b/sound/firewire/fireworks/fireworks.h
@@ -224,12 +224,4 @@ int snd_efw_get_multiplier_mode(unsigned int sampling_rate, unsigned int *mode);
 
 int snd_efw_create_hwdep_device(struct snd_efw *efw);
 
-#define SND_EFW_DEV_ENTRY(vendor, model) \
-{ \
-       .match_flags    = IEEE1394_MATCH_VENDOR_ID | \
-                         IEEE1394_MATCH_MODEL_ID, \
-       .vendor_id      = vendor,\
-       .model_id       = model \
-}
-
 #endif