Unverified Commit bb4a0f49 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

ASoC: codecs: lpass: Drop unused AIF_INVALID first DAI identifier 



All four Qualcomm SoC macro codecs define DAI IDs in an enum starting
with AIF_INVALID=0, which is nowhere used in the code thus actual DAI
IDs start from 1.  Drivers do not have their own of_xlate_dai_name(),
thus snd_soc_get_dlc() expects the DTS to start numbering DAIs from 0,
which creates confusing debugging scenario, e.g. DTS should use
<&lpass_wsamacro 2> for WSA_MACRO_AIF_VI with dai->id=3.

This also wastes some space, because drivers allocate few arrays for all
DAIs and basically the [0] is never used.

Drop the confusing first AIF_INVALID DAI identifier so the enum with DAI
IDs will start from 0.  This has little functional impact and does not
affect the ABI, except saving a few bytes of memory per driver.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20250523121811.380045-2-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 19272b37

sound/soc/codecs/lpass-rx-macro.c

+0 −1
Original line number Diff line number Diff line
@@ -619,7 +619,6 @@ static struct interp_sample_rate sr_val_tbl[] = { 
};



enum {

	RX_MACRO_AIF_INVALID = 0,

	RX_MACRO_AIF1_PB,

	RX_MACRO_AIF2_PB,

	RX_MACRO_AIF3_PB,

sound/soc/codecs/lpass-tx-macro.c

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ 
#define MCLK_FREQ		19200000



enum {

	TX_MACRO_AIF_INVALID = 0,

	TX_MACRO_AIF1_CAP,

	TX_MACRO_AIF2_CAP,

	TX_MACRO_AIF3_CAP,

sound/soc/codecs/lpass-va-macro.c

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ 
static const DECLARE_TLV_DB_SCALE(digital_gain, -8400, 100, -8400);



enum {

	VA_MACRO_AIF_INVALID = 0,

	VA_MACRO_AIF1_CAP,

	VA_MACRO_AIF2_CAP,

	VA_MACRO_AIF3_CAP,

sound/soc/codecs/lpass-wsa-macro.c

+0 −1
Original line number Diff line number Diff line
@@ -369,7 +369,6 @@ static struct interp_sample_rate int_mix_sample_rate_val[] = { 
};



enum {

	WSA_MACRO_AIF_INVALID = 0,

	WSA_MACRO_AIF1_PB,

	WSA_MACRO_AIF_MIX1_PB,

	WSA_MACRO_AIF_VI,