Unverified Commit ec5236c2 authored by Rob Herring's avatar Rob Herring Committed by Mark Brown
Browse files

ASoC: qcom/lpass: Constify struct lpass_variant 



'struct lpass_variant' is used for driver match data which is supposed to
be constant. It's not modified anywhere, so it's just a matter of adding
'const' everywhere.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20231006-dt-asoc-header-cleanups-v3-4-13a4f0f7fee6@kernel.org


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

sound/soc/qcom/lpass-apq8016.c

+3 −3
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static struct snd_soc_dai_driver apq8016_lpass_cpu_dai_driver[] = { 
static int apq8016_lpass_alloc_dma_channel(struct lpass_data *drvdata,

					   int direction, unsigned int dai_id)

{

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int chan = 0;



	if (direction == SNDRV_PCM_STREAM_PLAYBACK) {
@@ -157,7 +157,7 @@ static int apq8016_lpass_free_dma_channel(struct lpass_data *drvdata, int chan, 
static int apq8016_lpass_init(struct platform_device *pdev)

{

	struct lpass_data *drvdata = platform_get_drvdata(pdev);

	struct lpass_variant *variant = drvdata->variant;

	const struct lpass_variant *variant = drvdata->variant;

	struct device *dev = &pdev->dev;

	int ret, i;
@@ -223,7 +223,7 @@ static int apq8016_lpass_exit(struct platform_device *pdev) 
}





static struct lpass_variant apq8016_data = {

static const struct lpass_variant apq8016_data = {

	.i2sctrl_reg_base	= 0x1000,

	.i2sctrl_reg_stride	= 0x1000,

	.i2s_ports		= 4,

sound/soc/qcom/lpass-cdc-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static void __lpass_get_dmactl_handle(struct snd_pcm_substream *substream, struc 
	struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	unsigned int dai_id = cpu_dai->driver->id;



	switch (dai_id) {

sound/soc/qcom/lpass-cpu.c

+14 −14
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static int lpass_cpu_init_i2sctl_bitfields(struct device *dev, 
			struct lpaif_i2sctl *i2sctl, struct regmap *map)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;



	i2sctl->loopback = devm_regmap_field_alloc(dev, map, v->loopback);

	i2sctl->spken = devm_regmap_field_alloc(dev, map, v->spken);
@@ -463,7 +463,7 @@ static int asoc_qcom_of_xlate_dai_name(struct snd_soc_component *component, 
				   const char **dai_name)

{

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct lpass_variant *variant = drvdata->variant;

	const struct lpass_variant *variant = drvdata->variant;

	int id = args->args[0];

	int ret = -EINVAL;

	int i;
@@ -488,7 +488,7 @@ static const struct snd_soc_component_driver lpass_cpu_comp_driver = { 
static bool lpass_cpu_regmap_writeable(struct device *dev, unsigned int reg)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int i;



	for (i = 0; i < v->i2s_ports; ++i)
@@ -530,7 +530,7 @@ static bool lpass_cpu_regmap_writeable(struct device *dev, unsigned int reg) 
static bool lpass_cpu_regmap_readable(struct device *dev, unsigned int reg)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int i;



	for (i = 0; i < v->i2s_ports; ++i)
@@ -578,7 +578,7 @@ static bool lpass_cpu_regmap_readable(struct device *dev, unsigned int reg) 
static bool lpass_cpu_regmap_volatile(struct device *dev, unsigned int reg)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int i;



	for (i = 0; i < v->irq_ports; ++i) {
@@ -613,7 +613,7 @@ static struct regmap_config lpass_cpu_regmap_config = { 
static int lpass_hdmi_init_bitfields(struct device *dev, struct regmap *map)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	unsigned int i;

	struct lpass_hdmi_tx_ctl *tx_ctl;

	struct regmap_field *legacy_en;
@@ -691,7 +691,7 @@ static int lpass_hdmi_init_bitfields(struct device *dev, struct regmap *map) 
static bool lpass_hdmi_regmap_writeable(struct device *dev, unsigned int reg)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int i;



	if (reg == LPASS_HDMI_TX_CTL_ADDR(v))
@@ -736,7 +736,7 @@ static bool lpass_hdmi_regmap_writeable(struct device *dev, unsigned int reg) 
static bool lpass_hdmi_regmap_readable(struct device *dev, unsigned int reg)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int i;



	if (reg == LPASS_HDMI_TX_CTL_ADDR(v))
@@ -785,7 +785,7 @@ static bool lpass_hdmi_regmap_readable(struct device *dev, unsigned int reg) 
static bool lpass_hdmi_regmap_volatile(struct device *dev, unsigned int reg)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int i;



	if (reg == LPASS_HDMITX_APP_IRQSTAT_REG(v))
@@ -824,7 +824,7 @@ static struct regmap_config lpass_hdmi_regmap_config = { 
static bool __lpass_rxtx_regmap_accessible(struct device *dev, unsigned int reg, bool rw)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int i;



	for (i = 0; i < v->rxtx_irq_ports; ++i) {
@@ -890,7 +890,7 @@ static bool lpass_rxtx_regmap_readable(struct device *dev, unsigned int reg) 
static bool lpass_rxtx_regmap_volatile(struct device *dev, unsigned int reg)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int i;



	for (i = 0; i < v->rxtx_irq_ports; ++i) {
@@ -915,7 +915,7 @@ static bool lpass_rxtx_regmap_volatile(struct device *dev, unsigned int reg) 
static bool __lpass_va_regmap_accessible(struct device *dev, unsigned int reg, bool rw)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int i;



	for (i = 0; i < v->va_irq_ports; ++i) {
@@ -965,7 +965,7 @@ static bool lpass_va_regmap_readable(struct device *dev, unsigned int reg) 
static bool lpass_va_regmap_volatile(struct device *dev, unsigned int reg)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int i;



	for (i = 0; i < v->va_irq_ports; ++i) {
@@ -1104,7 +1104,7 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) 
	struct lpass_data *drvdata;

	struct device_node *dsp_of_node;

	struct resource *res;

	struct lpass_variant *variant;

	const struct lpass_variant *variant;

	struct device *dev = &pdev->dev;

	const struct of_device_id *match;

	int ret, i, dai_id;

sound/soc/qcom/lpass-ipq806x.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int ipq806x_lpass_free_dma_channel(struct lpass_data *drvdata, int chan, 
	return 0;

}



static struct lpass_variant ipq806x_data = {

static const struct lpass_variant ipq806x_data = {

	.i2sctrl_reg_base	= 0x0010,

	.i2sctrl_reg_stride	= 0x04,

	.i2s_ports		= 5,

sound/soc/qcom/lpass-platform.c

+18 −18
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int lpass_platform_alloc_rxtx_dmactl_fields(struct device *dev, 
					 struct regmap *map)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	struct lpaif_dmactl *rd_dmactl, *wr_dmactl;

	int rval;
@@ -128,7 +128,7 @@ static int lpass_platform_alloc_va_dmactl_fields(struct device *dev, 
					 struct regmap *map)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	struct lpaif_dmactl *wr_dmactl;



	wr_dmactl = devm_kzalloc(dev, sizeof(*wr_dmactl), GFP_KERNEL);
@@ -145,7 +145,7 @@ static int lpass_platform_alloc_dmactl_fields(struct device *dev, 
					 struct regmap *map)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	struct lpaif_dmactl *rd_dmactl, *wr_dmactl;

	int rval;
@@ -175,7 +175,7 @@ static int lpass_platform_alloc_hdmidmactl_fields(struct device *dev, 
					 struct regmap *map)

{

	struct lpass_data *drvdata = dev_get_drvdata(dev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	struct lpaif_dmactl *rd_dmactl;



	rd_dmactl = devm_kzalloc(dev, sizeof(struct lpaif_dmactl), GFP_KERNEL);
@@ -195,7 +195,7 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component, 
	struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int ret, dma_ch, dir = substream->stream;

	struct lpass_pcm_data *data;

	struct regmap *map;
@@ -287,7 +287,7 @@ static int lpass_platform_pcmops_close(struct snd_soc_component *component, 
	struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	struct lpass_pcm_data *data;

	unsigned int dai_id = cpu_dai->driver->id;
@@ -358,7 +358,7 @@ static int __lpass_get_id(const struct snd_pcm_substream *substream, 
	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int id;



	switch (cpu_dai->driver->id) {
@@ -421,7 +421,7 @@ static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component, 
	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	snd_pcm_format_t format = params_format(params);

	unsigned int channels = params_channels(params);

	unsigned int regval;
@@ -574,7 +574,7 @@ static int lpass_platform_pcmops_hw_free(struct snd_soc_component *component, 
	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	unsigned int reg;

	int ret;

	struct regmap *map;
@@ -602,7 +602,7 @@ static int lpass_platform_pcmops_prepare(struct snd_soc_component *component, 
	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	struct lpaif_dmactl *dmactl;

	struct regmap *map;

	int ret, id, ch, dir = substream->stream;
@@ -665,7 +665,7 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component, 
	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	struct lpaif_dmactl *dmactl;

	struct regmap *map;

	int ret, ch, id;
@@ -864,7 +864,7 @@ static snd_pcm_uframes_t lpass_platform_pcmops_pointer( 
	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	unsigned int base_addr, curr_addr;

	int ret, ch, dir = substream->stream;

	struct regmap *map;
@@ -928,7 +928,7 @@ static irqreturn_t lpass_dma_interrupt_handler( 
{

	struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	irqreturn_t ret = IRQ_NONE;

	int rv;

	unsigned int reg, val, mask;
@@ -1020,7 +1020,7 @@ static irqreturn_t lpass_dma_interrupt_handler( 
static irqreturn_t lpass_platform_lpaif_irq(int irq, void *data)

{

	struct lpass_data *drvdata = data;

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	unsigned int irqs;

	int rv, chan;
@@ -1048,7 +1048,7 @@ static irqreturn_t lpass_platform_lpaif_irq(int irq, void *data) 
static irqreturn_t lpass_platform_hdmiif_irq(int irq, void *data)

{

	struct lpass_data *drvdata = data;

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	unsigned int irqs;

	int rv, chan;
@@ -1078,7 +1078,7 @@ static irqreturn_t lpass_platform_hdmiif_irq(int irq, void *data) 
static irqreturn_t lpass_platform_rxtxif_irq(int irq, void *data)

{

	struct lpass_data *drvdata = data;

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	unsigned int irqs;

	irqreturn_t rv;

	int chan;
@@ -1103,7 +1103,7 @@ static irqreturn_t lpass_platform_rxtxif_irq(int irq, void *data) 
static irqreturn_t lpass_platform_vaif_irq(int irq, void *data)

{

	struct lpass_data *drvdata = data;

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	unsigned int irqs;

	irqreturn_t rv;

	int chan;
@@ -1268,7 +1268,7 @@ static const struct snd_soc_component_driver lpass_component_driver = { 
int asoc_qcom_lpass_platform_register(struct platform_device *pdev)

{

	struct lpass_data *drvdata = platform_get_drvdata(pdev);

	struct lpass_variant *v = drvdata->variant;

	const struct lpass_variant *v = drvdata->variant;

	int ret;



	drvdata->lpaif_irq = platform_get_irq_byname(pdev, "lpass-irq-lpaif");