Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()") introduced devm_ioremap_resource() and deprecated the use of devm_request_and_ioremap().

devm_request_mem_region is called in devm_ioremap_resource(). Hence that part can also be removed.

Since devm_ioremap_resource prints error message on failure, there is no need to print an explicit warning message.

Signed-off-by: Tushar Behera tushar.behera@linaro.org CC: alsa-devel@alsa-project.org CC: Liam Girdwood lgirdwood@gmail.com CC: Mark Brown broonie@kernel.org --- Changes for V3: * Rebased on for-next branch of sound/soc git tree git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

Changes for V2: * Removed redundant print of error message from devm_ioremap_resource exit path * Call to devm_request_mem_region is removed.

sound/soc/spear/spdif_out.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c index a4a8748..2fdf68c 100644 --- a/sound/soc/spear/spdif_out.c +++ b/sound/soc/spear/spdif_out.c @@ -282,27 +282,16 @@ static int spdif_out_probe(struct platform_device *pdev) struct resource *res; int ret;

- res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -EINVAL; - - if (!devm_request_mem_region(&pdev->dev, res->start, - resource_size(res), pdev->name)) { - dev_warn(&pdev->dev, "Failed to get memory resourse\n"); - return -ENOENT; - } - host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL); if (!host) { dev_warn(&pdev->dev, "kzalloc fail\n"); return -ENOMEM; }

- host->io_base = devm_request_and_ioremap(&pdev->dev, res); - if (!host->io_base) { - dev_warn(&pdev->dev, "ioremap failed\n"); - return -ENOMEM; - } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + host->io_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(host->io_base)) + return PTR_ERR(host->io_base);

host->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(host->clk))