diff options
| -rw-r--r-- | sound/soc/soc-core.c | 2 | ||||
| -rw-r--r-- | sound/soc/spear/spdif_out.c | 3 | ||||
| -rw-r--r-- | sound/soc/sprd/sprd-mcdt.c | 3 | ||||
| -rw-r--r-- | sound/soc/sti/sti_uniperif.c | 12 |
4 files changed, 5 insertions, 15 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 44e65f984a5c..da3cd7cf5808 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2957,7 +2957,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, if (!routes) { dev_err(card->dev, "ASoC: Could not allocate DAPM route table\n"); - return -EINVAL; + return -ENOMEM; } for (i = 0; i < num_routes; i++) { diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c index 38f9fff5be6b..549295a6ed50 100644 --- a/sound/soc/spear/spdif_out.c +++ b/sound/soc/spear/spdif_out.c @@ -287,8 +287,7 @@ static int spdif_out_probe(struct platform_device *pdev) if (!host) return -ENOMEM; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - host->io_base = devm_ioremap_resource(&pdev->dev, res); + host->io_base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(host->io_base)) return PTR_ERR(host->io_base); diff --git a/sound/soc/sprd/sprd-mcdt.c b/sound/soc/sprd/sprd-mcdt.c index 34b2ce733b54..f6a55fa60c1b 100644 --- a/sound/soc/sprd/sprd-mcdt.c +++ b/sound/soc/sprd/sprd-mcdt.c @@ -949,8 +949,7 @@ static int sprd_mcdt_probe(struct platform_device *pdev) if (!mcdt) return -ENOMEM; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - mcdt->base = devm_ioremap_resource(&pdev->dev, res); + mcdt->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(mcdt->base)) return PTR_ERR(mcdt->base); diff --git a/sound/soc/sti/sti_uniperif.c b/sound/soc/sti/sti_uniperif.c index e3561f00ed40..34668fe3909d 100644 --- a/sound/soc/sti/sti_uniperif.c +++ b/sound/soc/sti/sti_uniperif.c @@ -410,16 +410,8 @@ static int sti_uniperiph_cpu_dai_of(struct device_node *node, *dai = sti_uniperiph_dai_template; dai->name = dev_data->dai_names; - /* Get resources */ - uni->mem_region = platform_get_resource(priv->pdev, IORESOURCE_MEM, 0); - - if (!uni->mem_region) { - dev_err(dev, "Failed to get memory resource\n"); - return -ENODEV; - } - - uni->base = devm_ioremap_resource(dev, uni->mem_region); - + /* Get resources and base address */ + uni->base = devm_platform_get_and_ioremap_resource(priv->pdev, 0, &uni->mem_region); if (IS_ERR(uni->base)) return PTR_ERR(uni->base); |