Revert "ALSA: fireworks: add support for AudioFire2 quirk"

This reverts commit d34aa7c140f6e3626d6ef2b9a1da2e2d6d99f1b8.

The fix is superseded by the next commit as a better implementation
for supporting AudioFire2/AudioFire4/AudioFirePre8 quirks.

Signed-off-by: Takashi Sakamoto <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 c670db4eee70d42c91db2904354bf391267c22ef..2682e7e3e5c98511e8bd26fddf452427f1e83a6a 100644 (file)
--- a/sound/firewire/fireworks/fireworks.c
+++ b/sound/firewire/fireworks/fireworks.c
@@ -248,8 +248,6 @@ efw_probe(struct fw_unit *unit,
        err = get_hardware_info(efw);
        if (err < 0)
                goto error;
-       if (entry->model_id == MODEL_ECHO_AUDIOFIRE_2)
-               efw->is_af2 = true;
        if (entry->model_id == MODEL_ECHO_AUDIOFIRE_9)
                efw->is_af9 = true;
 

diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h
index c33252b7bc847501c4fc2c7b2c18d07a9ec18898..4f0201a95222a2502ec438199fe9e78cad33b647 100644 (file)
--- a/sound/firewire/fireworks/fireworks.h
+++ b/sound/firewire/fireworks/fireworks.h
@@ -70,7 +70,6 @@ struct snd_efw {
        bool resp_addr_changable;
 
        /* for quirks */
-       bool is_af2;
        bool is_af9;
        u32 firmware_version;
 

diff --git a/sound/firewire/fireworks/fireworks_stream.c b/sound/firewire/fireworks/fireworks_stream.c
index a0762dd6231e6080eb9ab86343c413db0bd64492..c55db1bddc80a0ceab4997279643f73840943cef 100644 (file)
--- a/sound/firewire/fireworks/fireworks_stream.c
+++ b/sound/firewire/fireworks/fireworks_stream.c
@@ -172,9 +172,6 @@ int snd_efw_stream_init_duplex(struct snd_efw *efw)
        efw->tx_stream.flags |= CIP_DBC_IS_END_EVENT;
        /* Fireworks reset dbc at bus reset. */
        efw->tx_stream.flags |= CIP_SKIP_DBC_ZERO_CHECK;
-       /* AudioFire2 starts packets with non-zero dbc. */
-       if (efw->is_af2)
-               efw->tx_stream.flags |= CIP_SKIP_INIT_DBC_CHECK;
        /* AudioFire9 always reports wrong dbs. */
        if (efw->is_af9)
                efw->tx_stream.flags |= CIP_WRONG_DBS;