ALSA: oxfw: code refactoring for wrong_dbs quirk

A new entry is added to the quirk enumeration for wrong_dbs quirk to
obsolete structure member.

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

diff --git a/sound/firewire/oxfw/oxfw-stream.c b/sound/firewire/oxfw/oxfw-stream.c
index c06173fd247d5ffddfbaf01232cc02a5f5624140..5771ff44dd5dc314229a818a0196f84d3e20c773 100644 (file)
--- a/sound/firewire/oxfw/oxfw-stream.c
+++ b/sound/firewire/oxfw/oxfw-stream.c
@@ -163,7 +163,7 @@ static int init_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream)
 
                if (oxfw->quirks & SND_OXFW_QUIRK_JUMBO_PAYLOAD)
                        flags |= CIP_JUMBO_PAYLOAD;
-               if (oxfw->wrong_dbs)
+               if (oxfw->quirks & SND_OXFW_QUIRK_WRONG_DBS)
                        flags |= CIP_WRONG_DBS;
        } else {
                conn = &oxfw->in_conn;

diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index 90a66e1312fef96adb252ae31e939016acc03433..966697dace479305370c8d254c5307420320e029 100644 (file)
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -176,7 +176,7 @@ static int detect_quirks(struct snd_oxfw *oxfw)
         * value in 'dbs' field of CIP header against its format information.
         */
        if (vendor == VENDOR_LOUD && model == MODEL_SATELLITE)
-               oxfw->wrong_dbs = true;
+               oxfw->quirks |= SND_OXFW_QUIRK_WRONG_DBS;
 
        return 0;
 }

diff --git a/sound/firewire/oxfw/oxfw.h b/sound/firewire/oxfw/oxfw.h
index 07aa0d25e1002e171dde3cfed4cbcb94e009ec3c..4002998d41e8af6b17f1a8fff7e36bbe98e373e6 100644 (file)
--- a/sound/firewire/oxfw/oxfw.h
+++ b/sound/firewire/oxfw/oxfw.h
@@ -36,6 +36,8 @@ enum snd_oxfw_quirk {
        // Postpone transferring packets during handling asynchronous transaction. As a result,
        // next isochronous packet includes more events than one packet can include.
        SND_OXFW_QUIRK_JUMBO_PAYLOAD = 0x01,
+       // The dbs field of CIP header in tx packet is wrong.
+       SND_OXFW_QUIRK_WRONG_DBS = 0x02,
 };
 
 /* This is an arbitrary number for convinience. */
@@ -51,7 +53,6 @@ struct snd_oxfw {
 
        // The combination of snd_oxfw_quirk enumeration-constants.
        unsigned int quirks;
-       bool wrong_dbs;
        bool has_output;
        bool has_input;
        u8 *tx_stream_formats[SND_OXFW_STREAM_FORMAT_ENTRIES];