diff options
| author | Mark Brown <broonie@kernel.org> | 2021-10-29 22:00:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-29 22:00:00 +0100 |
| commit | 318a54c0ee4aaa3bfd69fdf505588510c7672c0c (patch) | |
| tree | fcd342658639851179ab88c0eb317e83b586eb71 /sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | |
| parent | 8e14329645bc7d722e1ec913025b54199fafaee3 (diff) | |
| parent | 6195eb15f6d60dd92d1644dc11f1c1c2e84ebfeb (diff) | |
| download | linux-318a54c0ee4aaa3bfd69fdf505588510c7672c0c.tar.gz linux-318a54c0ee4aaa3bfd69fdf505588510c7672c0c.tar.bz2 linux-318a54c0ee4aaa3bfd69fdf505588510c7672c0c.zip | |
Merge remote-tracking branch 'asoc/for-5.16' into asoc-next
Diffstat (limited to 'sound/soc/mediatek/mt8195/mt8195-afe-pcm.c')
| -rw-r--r-- | sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c index 6635c3f72ecc..2bb05a828e8d 100644 --- a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c +++ b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c @@ -2232,7 +2232,7 @@ static const struct mtk_base_memif_data memif_data[MT8195_AFE_MEMIF_NUM] = { }, }; -static const struct mtk_base_irq_data irq_data[MT8195_AFE_IRQ_NUM] = { +static const struct mtk_base_irq_data irq_data_array[MT8195_AFE_IRQ_NUM] = { [MT8195_AFE_IRQ_1] = { .id = MT8195_AFE_IRQ_1, .irq_cnt_reg = -1, @@ -3057,7 +3057,6 @@ static int mt8195_afe_pcm_dev_probe(struct platform_device *pdev) { struct mtk_base_afe *afe; struct mt8195_afe_private *afe_priv; - struct resource *res; struct device *dev = &pdev->dev; int i, irq_id, ret; struct snd_soc_component *component; @@ -3078,8 +3077,7 @@ static int mt8195_afe_pcm_dev_probe(struct platform_device *pdev) afe_priv = afe->platform_priv; afe->dev = &pdev->dev; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - afe->base_addr = devm_ioremap_resource(&pdev->dev, res); + afe->base_addr = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(afe->base_addr)) return PTR_ERR(afe->base_addr); @@ -3102,7 +3100,7 @@ static int mt8195_afe_pcm_dev_probe(struct platform_device *pdev) return -ENOMEM; for (i = 0; i < afe->irqs_size; i++) - afe->irqs[i].irq_data = &irq_data[i]; + afe->irqs[i].irq_data = &irq_data_array[i]; /* init memif */ afe->memif_size = MT8195_AFE_MEMIF_NUM; @@ -3266,9 +3264,7 @@ static struct platform_driver mt8195_afe_pcm_driver = { .driver = { .name = "mt8195-audio", .of_match_table = mt8195_afe_pcm_dt_match, -#ifdef CONFIG_PM .pm = &mt8195_afe_pm_ops, -#endif }, .probe = mt8195_afe_pcm_dev_probe, .remove = mt8195_afe_pcm_dev_remove, |