| Message ID | 20240612-asoc-wcd9xxx-wide-cleanups-v1-21-0d15885b2a06@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f49100faccb5d2ffb4c9e5e4bba6173f5ac43d22 |
| Headers | show |
| Series | ASoC: codecs: wcd family: cleanups | expand |
On 12/06/2024 18:15, Krzysztof Kozlowski wrote: > Driver does not modify static wcd939x_sdw_ch_info array, so it can be > made const for code safety. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > sound/soc/codecs/wcd939x-sdw.c | 4 ++-- > sound/soc/codecs/wcd939x.c | 2 +- > sound/soc/codecs/wcd939x.h | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/codecs/wcd939x-sdw.c b/sound/soc/codecs/wcd939x-sdw.c > index 8acb5651c5bc..94b1e99a3ca0 100644 > --- a/sound/soc/codecs/wcd939x-sdw.c > +++ b/sound/soc/codecs/wcd939x-sdw.c > @@ -23,7 +23,7 @@ > > #define SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(m) (0xE0 + 0x10 * (m)) > > -static struct wcd939x_sdw_ch_info wcd939x_sdw_rx_ch_info[] = { > +static const struct wcd939x_sdw_ch_info wcd939x_sdw_rx_ch_info[] = { > WCD_SDW_CH(WCD939X_HPH_L, WCD939X_HPH_PORT, BIT(0)), > WCD_SDW_CH(WCD939X_HPH_R, WCD939X_HPH_PORT, BIT(1)), > WCD_SDW_CH(WCD939X_CLSH, WCD939X_CLSH_PORT, BIT(0)), > @@ -36,7 +36,7 @@ static struct wcd939x_sdw_ch_info wcd939x_sdw_rx_ch_info[] = { > WCD_SDW_CH(WCD939X_HIFI_PCM_R, WCD939X_HIFI_PCM_PORT, BIT(1)), > }; > > -static struct wcd939x_sdw_ch_info wcd939x_sdw_tx_ch_info[] = { > +static const struct wcd939x_sdw_ch_info wcd939x_sdw_tx_ch_info[] = { > WCD_SDW_CH(WCD939X_ADC1, WCD939X_ADC_1_4_PORT, BIT(0)), > WCD_SDW_CH(WCD939X_ADC2, WCD939X_ADC_1_4_PORT, BIT(1)), > WCD_SDW_CH(WCD939X_ADC3, WCD939X_ADC_1_4_PORT, BIT(2)), > diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c > index 1f94f49f9829..66af035bd0e5 100644 > --- a/sound/soc/codecs/wcd939x.c > +++ b/sound/soc/codecs/wcd939x.c > @@ -414,7 +414,7 @@ static int wcd939x_io_init(struct snd_soc_component *component) > return 0; > } > > -static int wcd939x_sdw_connect_port(struct wcd939x_sdw_ch_info *ch_info, > +static int wcd939x_sdw_connect_port(const struct wcd939x_sdw_ch_info *ch_info, > struct sdw_port_config *port_config, > u8 enable) > { > diff --git a/sound/soc/codecs/wcd939x.h b/sound/soc/codecs/wcd939x.h > index 756f497a337c..a6c9c6cee056 100644 > --- a/sound/soc/codecs/wcd939x.h > +++ b/sound/soc/codecs/wcd939x.h > @@ -914,7 +914,7 @@ struct wcd939x_sdw_priv { > struct sdw_stream_config sconfig; > struct sdw_stream_runtime *sruntime; > struct sdw_port_config port_config[WCD939X_MAX_SWR_PORTS]; > - struct wcd939x_sdw_ch_info *ch_info; > + const struct wcd939x_sdw_ch_info *ch_info; > bool port_enable[WCD939X_MAX_SWR_CH_IDS]; > int active_ports; > int num_ports; > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/sound/soc/codecs/wcd939x-sdw.c b/sound/soc/codecs/wcd939x-sdw.c index 8acb5651c5bc..94b1e99a3ca0 100644 --- a/sound/soc/codecs/wcd939x-sdw.c +++ b/sound/soc/codecs/wcd939x-sdw.c @@ -23,7 +23,7 @@ #define SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(m) (0xE0 + 0x10 * (m)) -static struct wcd939x_sdw_ch_info wcd939x_sdw_rx_ch_info[] = { +static const struct wcd939x_sdw_ch_info wcd939x_sdw_rx_ch_info[] = { WCD_SDW_CH(WCD939X_HPH_L, WCD939X_HPH_PORT, BIT(0)), WCD_SDW_CH(WCD939X_HPH_R, WCD939X_HPH_PORT, BIT(1)), WCD_SDW_CH(WCD939X_CLSH, WCD939X_CLSH_PORT, BIT(0)), @@ -36,7 +36,7 @@ static struct wcd939x_sdw_ch_info wcd939x_sdw_rx_ch_info[] = { WCD_SDW_CH(WCD939X_HIFI_PCM_R, WCD939X_HIFI_PCM_PORT, BIT(1)), }; -static struct wcd939x_sdw_ch_info wcd939x_sdw_tx_ch_info[] = { +static const struct wcd939x_sdw_ch_info wcd939x_sdw_tx_ch_info[] = { WCD_SDW_CH(WCD939X_ADC1, WCD939X_ADC_1_4_PORT, BIT(0)), WCD_SDW_CH(WCD939X_ADC2, WCD939X_ADC_1_4_PORT, BIT(1)), WCD_SDW_CH(WCD939X_ADC3, WCD939X_ADC_1_4_PORT, BIT(2)), diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c index 1f94f49f9829..66af035bd0e5 100644 --- a/sound/soc/codecs/wcd939x.c +++ b/sound/soc/codecs/wcd939x.c @@ -414,7 +414,7 @@ static int wcd939x_io_init(struct snd_soc_component *component) return 0; } -static int wcd939x_sdw_connect_port(struct wcd939x_sdw_ch_info *ch_info, +static int wcd939x_sdw_connect_port(const struct wcd939x_sdw_ch_info *ch_info, struct sdw_port_config *port_config, u8 enable) { diff --git a/sound/soc/codecs/wcd939x.h b/sound/soc/codecs/wcd939x.h index 756f497a337c..a6c9c6cee056 100644 --- a/sound/soc/codecs/wcd939x.h +++ b/sound/soc/codecs/wcd939x.h @@ -914,7 +914,7 @@ struct wcd939x_sdw_priv { struct sdw_stream_config sconfig; struct sdw_stream_runtime *sruntime; struct sdw_port_config port_config[WCD939X_MAX_SWR_PORTS]; - struct wcd939x_sdw_ch_info *ch_info; + const struct wcd939x_sdw_ch_info *ch_info; bool port_enable[WCD939X_MAX_SWR_CH_IDS]; int active_ports; int num_ports;
Driver does not modify static wcd939x_sdw_ch_info array, so it can be made const for code safety. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- sound/soc/codecs/wcd939x-sdw.c | 4 ++-- sound/soc/codecs/wcd939x.c | 2 +- sound/soc/codecs/wcd939x.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)