* [PATCH 1/2] ASoC: soc-dai.h: Constify DAI ops auto_selectable_formats
@ 2024-06-17 9:21 Krzysztof Kozlowski
2024-06-17 9:21 ` [PATCH 2/2] ASoC: " Krzysztof Kozlowski
2024-06-17 11:24 ` [PATCH 1/2] ASoC: soc-dai.h: " Herve Codina
0 siblings, 2 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2024-06-17 9:21 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Support Opensource, Herve Codina, Shenghao Ding, Kevin Lu,
Baojun Xu, linux-sound, linux-kernel, alsa-devel
Cc: Krzysztof Kozlowski
The core ASoC code does not modify contents of the
'auto_selectable_formats' array passed in 'struct snd_soc_dai_ops', so
make it const for code safety.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
include/sound/soc-dai.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 15ef268c9845..279223c4ef5e 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -361,7 +361,7 @@ struct snd_soc_dai_ops {
* see
* snd_soc_dai_get_fmt()
*/
- u64 *auto_selectable_formats;
+ const u64 *auto_selectable_formats;
int num_auto_selectable_formats;
/* probe ordering - for components with runtime dependencies */
--
2.43.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ASoC: Constify DAI ops auto_selectable_formats
2024-06-17 9:21 [PATCH 1/2] ASoC: soc-dai.h: Constify DAI ops auto_selectable_formats Krzysztof Kozlowski
@ 2024-06-17 9:21 ` Krzysztof Kozlowski
2024-06-17 11:24 ` Herve Codina
2024-06-17 11:24 ` [PATCH 1/2] ASoC: soc-dai.h: " Herve Codina
1 sibling, 1 reply; 5+ messages in thread
From: Krzysztof Kozlowski @ 2024-06-17 9:21 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Support Opensource, Herve Codina, Shenghao Ding, Kevin Lu,
Baojun Xu, linux-sound, linux-kernel, alsa-devel
Cc: Krzysztof Kozlowski
The static arrays passed as 'auto_selectable_formats' are not modified
by the drivers nor by the core code, so make it const for code safety.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
sound/soc/codecs/ak4613.c | 2 +-
sound/soc/codecs/da7213.c | 2 +-
sound/soc/codecs/hdmi-codec.c | 2 +-
sound/soc/codecs/idt821034.c | 2 +-
sound/soc/codecs/pcm3168a.c | 2 +-
sound/soc/codecs/peb2466.c | 2 +-
sound/soc/generic/test-component.c | 2 +-
sound/soc/sh/fsi.c | 2 +-
sound/soc/sh/rcar/core.c | 2 +-
sound/soc/soc-utils.c | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c
index 73fb35560e51..551738abd1a5 100644
--- a/sound/soc/codecs/ak4613.c
+++ b/sound/soc/codecs/ak4613.c
@@ -753,7 +753,7 @@ static int ak4613_dai_trigger(struct snd_pcm_substream *substream, int cmd,
* SND_SOC_DAIFMT_CBC_CFC
* SND_SOC_DAIFMT_CBP_CFP
*/
-static u64 ak4613_dai_formats =
+static const u64 ak4613_dai_formats =
SND_SOC_POSSIBLE_DAIFMT_I2S |
SND_SOC_POSSIBLE_DAIFMT_LEFT_J;
diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index a2b328f3b39f..f3ef6fb55304 100644
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1720,7 +1720,7 @@ static int da7213_set_component_pll(struct snd_soc_component *component,
* SND_SOC_DAIFMT_CBC_CFC
* SND_SOC_DAIFMT_CBP_CFP
*/
-static u64 da7213_dai_formats =
+static const u64 da7213_dai_formats =
SND_SOC_POSSIBLE_DAIFMT_I2S |
SND_SOC_POSSIBLE_DAIFMT_LEFT_J |
SND_SOC_POSSIBLE_DAIFMT_RIGHT_J |
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index d3abb7ce2153..74caae52e127 100644
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@ -715,7 +715,7 @@ static int hdmi_codec_mute(struct snd_soc_dai *dai, int mute, int direction)
* For example,
* ${LINUX}/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
*/
-static u64 hdmi_codec_formats =
+static const u64 hdmi_codec_formats =
SND_SOC_POSSIBLE_DAIFMT_NB_NF |
SND_SOC_POSSIBLE_DAIFMT_NB_IF |
SND_SOC_POSSIBLE_DAIFMT_IB_NF |
diff --git a/sound/soc/codecs/idt821034.c b/sound/soc/codecs/idt821034.c
index 2cc7b9166e69..cb7a68c799f8 100644
--- a/sound/soc/codecs/idt821034.c
+++ b/sound/soc/codecs/idt821034.c
@@ -860,7 +860,7 @@ static int idt821034_dai_startup(struct snd_pcm_substream *substream,
return 0;
}
-static u64 idt821034_dai_formats[] = {
+static const u64 idt821034_dai_formats[] = {
SND_SOC_POSSIBLE_DAIFMT_DSP_A |
SND_SOC_POSSIBLE_DAIFMT_DSP_B,
};
diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c
index 3c0e0fdbfc5c..fac0617ab95b 100644
--- a/sound/soc/codecs/pcm3168a.c
+++ b/sound/soc/codecs/pcm3168a.c
@@ -562,7 +562,7 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream,
return 0;
}
-static u64 pcm3168a_dai_formats[] = {
+static const u64 pcm3168a_dai_formats[] = {
/*
* Select below from Sound Card, not here
* SND_SOC_DAIFMT_CBC_CFC
diff --git a/sound/soc/codecs/peb2466.c b/sound/soc/codecs/peb2466.c
index 5dec69be0acb..76ee7e3f4d9b 100644
--- a/sound/soc/codecs/peb2466.c
+++ b/sound/soc/codecs/peb2466.c
@@ -814,7 +814,7 @@ static int peb2466_dai_startup(struct snd_pcm_substream *substream,
&peb2466_sample_bits_constr);
}
-static u64 peb2466_dai_formats[] = {
+static const u64 peb2466_dai_formats[] = {
SND_SOC_POSSIBLE_DAIFMT_DSP_A |
SND_SOC_POSSIBLE_DAIFMT_DSP_B,
};
diff --git a/sound/soc/generic/test-component.c b/sound/soc/generic/test-component.c
index e4967540a2e1..e9e5e235a8a6 100644
--- a/sound/soc/generic/test-component.c
+++ b/sound/soc/generic/test-component.c
@@ -189,7 +189,7 @@ static int test_dai_bespoke_trigger(struct snd_pcm_substream *substream,
return 0;
}
-static u64 test_dai_formats =
+static const u64 test_dai_formats =
/*
* Select below from Sound Card, not auto
* SND_SOC_POSSIBLE_DAIFMT_BP_FP
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 84601ba43b7d..087e379aa3bc 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1713,7 +1713,7 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
* SND_SOC_DAIFMT_CBC_CFC
* SND_SOC_DAIFMT_CBP_CFP
*/
-static u64 fsi_dai_formats =
+static const u64 fsi_dai_formats =
SND_SOC_POSSIBLE_DAIFMT_I2S |
SND_SOC_POSSIBLE_DAIFMT_LEFT_J |
SND_SOC_POSSIBLE_DAIFMT_NB_NF |
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 6bc7027ed4db..63b3c8bf0fde 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1061,7 +1061,7 @@ static int rsnd_soc_dai_prepare(struct snd_pcm_substream *substream,
return rsnd_dai_call(prepare, io, priv);
}
-static u64 rsnd_soc_dai_formats[] = {
+static const u64 rsnd_soc_dai_formats[] = {
/*
* 1st Priority
*
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index d05e712c9518..20135a8359bf 100644
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -163,7 +163,7 @@ static const struct snd_soc_component_driver dummy_codec = {
* SND_SOC_POSSIBLE_DAIFMT_CBC_CFP
* SND_SOC_POSSIBLE_DAIFMT_CBC_CFC
*/
-static u64 dummy_dai_formats =
+static const u64 dummy_dai_formats =
SND_SOC_POSSIBLE_DAIFMT_I2S |
SND_SOC_POSSIBLE_DAIFMT_RIGHT_J |
SND_SOC_POSSIBLE_DAIFMT_LEFT_J |
--
2.43.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ASoC: soc-dai.h: Constify DAI ops auto_selectable_formats
2024-06-17 9:21 [PATCH 1/2] ASoC: soc-dai.h: Constify DAI ops auto_selectable_formats Krzysztof Kozlowski
2024-06-17 9:21 ` [PATCH 2/2] ASoC: " Krzysztof Kozlowski
@ 2024-06-17 11:24 ` Herve Codina
1 sibling, 0 replies; 5+ messages in thread
From: Herve Codina @ 2024-06-17 11:24 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Support Opensource, Shenghao Ding, Kevin Lu, Baojun Xu,
linux-sound, linux-kernel, alsa-devel
Hi Krzysztof,
On Mon, 17 Jun 2024 11:21:51 +0200
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:
> The core ASoC code does not modify contents of the
> 'auto_selectable_formats' array passed in 'struct snd_soc_dai_ops', so
> make it const for code safety.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Herve Codina <herve.codina@bootlin.com>
Best regards,
Hervé
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ASoC: Constify DAI ops auto_selectable_formats
2024-06-17 9:21 ` [PATCH 2/2] ASoC: " Krzysztof Kozlowski
@ 2024-06-17 11:24 ` Herve Codina
2024-06-17 12:26 ` Krzysztof Kozlowski
0 siblings, 1 reply; 5+ messages in thread
From: Herve Codina @ 2024-06-17 11:24 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Support Opensource, Shenghao Ding, Kevin Lu, Baojun Xu,
linux-sound, linux-kernel, alsa-devel
Hi Krzysztof,
On Mon, 17 Jun 2024 11:21:52 +0200
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:
> The static arrays passed as 'auto_selectable_formats' are not modified
> by the drivers nor by the core code, so make it const for code safety.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
> sound/soc/codecs/ak4613.c | 2 +-
> sound/soc/codecs/da7213.c | 2 +-
> sound/soc/codecs/hdmi-codec.c | 2 +-
> sound/soc/codecs/idt821034.c | 2 +-
> sound/soc/codecs/pcm3168a.c | 2 +-
> sound/soc/codecs/peb2466.c | 2 +-
> sound/soc/generic/test-component.c | 2 +-
> sound/soc/sh/fsi.c | 2 +-
> sound/soc/sh/rcar/core.c | 2 +-
> sound/soc/soc-utils.c | 2 +-
> 10 files changed, 10 insertions(+), 10 deletions(-)
>
I think you miss sound/soc/codecs/framer-codec.c
Best regards,
Hervé
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ASoC: Constify DAI ops auto_selectable_formats
2024-06-17 11:24 ` Herve Codina
@ 2024-06-17 12:26 ` Krzysztof Kozlowski
0 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2024-06-17 12:26 UTC (permalink / raw)
To: Herve Codina
Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Support Opensource, Shenghao Ding, Kevin Lu, Baojun Xu,
linux-sound, linux-kernel, alsa-devel
On 17/06/2024 13:24, Herve Codina wrote:
> Hi Krzysztof,
>
> On Mon, 17 Jun 2024 11:21:52 +0200
> Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:
>
>> The static arrays passed as 'auto_selectable_formats' are not modified
>> by the drivers nor by the core code, so make it const for code safety.
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> ---
>> sound/soc/codecs/ak4613.c | 2 +-
>> sound/soc/codecs/da7213.c | 2 +-
>> sound/soc/codecs/hdmi-codec.c | 2 +-
>> sound/soc/codecs/idt821034.c | 2 +-
>> sound/soc/codecs/pcm3168a.c | 2 +-
>> sound/soc/codecs/peb2466.c | 2 +-
>> sound/soc/generic/test-component.c | 2 +-
>> sound/soc/sh/fsi.c | 2 +-
>> sound/soc/sh/rcar/core.c | 2 +-
>> sound/soc/soc-utils.c | 2 +-
>> 10 files changed, 10 insertions(+), 10 deletions(-)
>>
>
> I think you miss sound/soc/codecs/framer-codec.c
Yes, indeed, thanks!
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-17 12:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-17 9:21 [PATCH 1/2] ASoC: soc-dai.h: Constify DAI ops auto_selectable_formats Krzysztof Kozlowski
2024-06-17 9:21 ` [PATCH 2/2] ASoC: " Krzysztof Kozlowski
2024-06-17 11:24 ` Herve Codina
2024-06-17 12:26 ` Krzysztof Kozlowski
2024-06-17 11:24 ` [PATCH 1/2] ASoC: soc-dai.h: " Herve Codina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox