On 10 June 2013 17:05, Tushar Behera <tushar.beh...@linaro.org> wrote:
> Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
> introduced devm_ioremap_resource() and deprecated the use of
> devm_request_and_ioremap().
This patch does a little more than just conversion. May that change
could be mentioned here.
>
> Signed-off-by: Tushar Behera <tushar.beh...@linaro.org>
> CC: alsa-de...@alsa-project.org
> CC: Liam Girdwood <lgirdw...@gmail.com>
> CC: Mark Brown <broo...@kernel.org>
> ---
> sound/soc/spear/spdif_out.c | 20 +++++---------------
> 1 file changed, 5 insertions(+), 15 deletions(-)
>
> diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c
> index 4bde512..896ee7f 100644
> --- a/sound/soc/spear/spdif_out.c
> +++ b/sound/soc/spear/spdif_out.c
> @@ -282,27 +282,17 @@ 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->start,
> - resource_size(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)) {
> + dev_warn(&pdev->dev, "devm_ioremap_resource failed\n");
This print is not needed as devm_ioremap_resource prints its own messages.
> + return PTR_ERR(host->io_base);
> }
>
> host->clk = devm_clk_get(&pdev->dev, NULL);
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
