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

ASoC: Constify channel mapping array arguments in set_channel_map() 



There is no need for implementations of DAI set_channel_map() to modify
contents of passed arrays with actual channel mapping.  Additionally,
the caller keeps full ownership of the array.

Constify these pointer arguments so the code will be safer and easier to
read (documenting the caller's ownership).

Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20240520-asoc-x1e80100-4-channel-mapping-v4-1-f657159b4aad@linaro.org


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

include/sound/cs35l41.h

+2 −2
Original line number Diff line number Diff line
@@ -896,8 +896,8 @@ int cs35l41_test_key_lock(struct device *dev, struct regmap *regmap); 
int cs35l41_otp_unpack(struct device *dev, struct regmap *regmap);

int cs35l41_register_errata_patch(struct device *dev, struct regmap *reg, unsigned int reg_revid);

int cs35l41_set_channels(struct device *dev, struct regmap *reg,

			 unsigned int tx_num, unsigned int *tx_slot,

			 unsigned int rx_num, unsigned int *rx_slot);

			 unsigned int tx_num, const unsigned int *tx_slot,

			 unsigned int rx_num, const unsigned int *rx_slot);

int cs35l41_gpio_config(struct regmap *regmap, struct cs35l41_hw_cfg *hw_cfg);

void cs35l41_configure_cs_dsp(struct device *dev, struct regmap *reg, struct cs_dsp *dsp);

int cs35l41_set_cspl_mbox_cmd(struct device *dev, struct regmap *regmap,

include/sound/soc-dai.h

+4 −4
Original line number Diff line number Diff line
@@ -188,8 +188,8 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, 
	unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width);



int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai,

	unsigned int tx_num, unsigned int *tx_slot,

	unsigned int rx_num, unsigned int *rx_slot);

	unsigned int tx_num, const unsigned int *tx_slot,

	unsigned int rx_num, const unsigned int *rx_slot);



int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate);
@@ -305,8 +305,8 @@ struct snd_soc_dai_ops { 
		unsigned int tx_mask, unsigned int rx_mask,

		int slots, int slot_width);

	int (*set_channel_map)(struct snd_soc_dai *dai,

		unsigned int tx_num, unsigned int *tx_slot,

		unsigned int rx_num, unsigned int *rx_slot);

		unsigned int tx_num, const unsigned int *tx_slot,

		unsigned int rx_num, const unsigned int *rx_slot);

	int (*get_channel_map)(struct snd_soc_dai *dai,

			unsigned int *tx_num, unsigned int *tx_slot,

			unsigned int *rx_num, unsigned int *rx_slot);

sound/soc/codecs/adau7118.c

+4 −2
Original line number Diff line number Diff line
@@ -121,8 +121,10 @@ static const struct snd_soc_dapm_widget adau7118_widgets[] = { 
};



static int adau7118_set_channel_map(struct snd_soc_dai *dai,

				    unsigned int tx_num, unsigned int *tx_slot,

				    unsigned int rx_num, unsigned int *rx_slot)

				    unsigned int tx_num,

				    const unsigned int *tx_slot,

				    unsigned int rx_num,

				    const unsigned int *rx_slot)

{

	struct adau7118_data *st =

		snd_soc_component_get_drvdata(dai->component);

sound/soc/codecs/cs35l41-lib.c

+2 −2
Original line number Diff line number Diff line
@@ -936,8 +936,8 @@ int cs35l41_register_errata_patch(struct device *dev, struct regmap *reg, unsign 
EXPORT_SYMBOL_GPL(cs35l41_register_errata_patch);



int cs35l41_set_channels(struct device *dev, struct regmap *reg,

			 unsigned int tx_num, unsigned int *tx_slot,

			 unsigned int rx_num, unsigned int *rx_slot)

			 unsigned int tx_num, const unsigned int *tx_slot,

			 unsigned int rx_num, const unsigned int *rx_slot)

{

	unsigned int val, mask;

	int i;

sound/soc/codecs/cs35l41.c

+2 −1
Original line number Diff line number Diff line
@@ -673,7 +673,8 @@ static const struct snd_soc_dapm_route cs35l41_audio_map[] = { 
};



static int cs35l41_set_channel_map(struct snd_soc_dai *dai, unsigned int tx_n,

				   unsigned int *tx_slot, unsigned int rx_n, unsigned int *rx_slot)

				   const unsigned int *tx_slot,

				   unsigned int rx_n, const unsigned int *rx_slot)

{

	struct cs35l41_private *cs35l41 = snd_soc_component_get_drvdata(dai->component);