lkml.org 
[lkml]   [2013]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 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().

    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 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 | 20 ++++----------------
    1 file changed, 4 insertions(+), 16 deletions(-)

    diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c
    index 4bde512..64db05a 100644
    --- a/sound/soc/spear/spdif_out.c
    +++ b/sound/soc/spear/spdif_out.c
    @@ -282,28 +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->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))
    + return PTR_ERR(host->io_base);

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


    \
     
     \ /
      Last update: 2013-06-17 12:41    [W:4.072 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site