lkml.org 
[lkml]   [2013]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/15] ASoC: spear: Convert to use devm_ioremap_resource
    Date
    Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
    introduced devm_ioremap_resource() and deprecated the use of
    devm_request_and_ioremap().

    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>
    ---
    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");
    + return PTR_ERR(host->io_base);
    }

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


    \
     
     \ /
      Last update: 2013-06-10 14:01    [W:4.285 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site