diff options
| author | Mark Brown <broonie@kernel.org> | 2023-10-09 20:49:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-10-09 23:14:18 +0100 |
| commit | a7ec043e601d1dca69ac827f51dbe1dbaa1e89aa (patch) | |
| tree | fea389769379eb60420f9bce7639ef0e431d67e9 /sound/soc/qcom/lpass-sc7280.c | |
| parent | f0d82f073d79cecbbaffff425c41db4c16b395f6 (diff) | |
| parent | 9958d85968ed2df4b704105fd2a9c3669eb9cd97 (diff) | |
ASoC: DT matching and header cleanups
Merge series from Rob Herring <robh@kernel.org>:
This is a series is part of ongoing clean-ups related to device
matching and DT related implicit includes. Essentially of_device.h has
a bunch of implicit includes and generally isn't needed any nore except
for of_match_device(). As we also generally want to get rid of
of_match_device() as well, I've done that so we're not updating the
includes twice.
Diffstat (limited to 'sound/soc/qcom/lpass-sc7280.c')
| -rw-r--r-- | sound/soc/qcom/lpass-sc7280.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/qcom/lpass-sc7280.c b/sound/soc/qcom/lpass-sc7280.c index 6b2eb25ed939..7cd3e291382a 100644 --- a/sound/soc/qcom/lpass-sc7280.c +++ b/sound/soc/qcom/lpass-sc7280.c @@ -110,7 +110,7 @@ static struct snd_soc_dai_driver sc7280_lpass_cpu_dai_driver[] = { static int sc7280_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; switch (dai_id) { @@ -196,7 +196,7 @@ static int sc7280_lpass_free_dma_channel(struct lpass_data *drvdata, int chan, u static int sc7280_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; @@ -252,7 +252,7 @@ static const struct dev_pm_ops sc7280_lpass_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(sc7280_lpass_dev_suspend, sc7280_lpass_dev_resume) }; -static struct lpass_variant sc7280_data = { +static const struct lpass_variant sc7280_data = { .i2sctrl_reg_base = 0x1000, .i2sctrl_reg_stride = 0x1000, .i2s_ports = 3, |