lkml.org 
[lkml]   [2013]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/33] Input: Convert to devm_ioremap_resource()
    Date
    Convert all uses of devm_request_and_ioremap() to the newly introduced
    devm_ioremap_resource() which provides more consistent error handling.

    devm_ioremap_resource() provides its own error messages so all explicit
    error messages can be removed from the failure code paths.

    Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
    Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Cc: linux-input@vger.kernel.org
    ---
    drivers/input/keyboard/spear-keyboard.c | 8 +++-----
    drivers/input/serio/arc_ps2.c | 7 ++++---
    2 files changed, 7 insertions(+), 8 deletions(-)

    diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c
    index 695d237..cb1e8f6 100644
    --- a/drivers/input/keyboard/spear-keyboard.c
    +++ b/drivers/input/keyboard/spear-keyboard.c
    @@ -228,11 +228,9 @@ static int spear_kbd_probe(struct platform_device *pdev)
    kbd->suspended_rate = pdata->suspended_rate;
    }

    - kbd->io_base = devm_request_and_ioremap(&pdev->dev, res);
    - if (!kbd->io_base) {
    - dev_err(&pdev->dev, "request-ioremap failed for kbd_region\n");
    - return -ENOMEM;
    - }
    + kbd->io_base = devm_ioremap_resource(&pdev->dev, res);
    + if (IS_ERR(kbd->io_base))
    + return PTR_ERR(kbd->io_base);

    kbd->clk = devm_clk_get(&pdev->dev, NULL);
    if (IS_ERR(kbd->clk))
    diff --git a/drivers/input/serio/arc_ps2.c b/drivers/input/serio/arc_ps2.c
    index b571eb3..c52e3e5 100644
    --- a/drivers/input/serio/arc_ps2.c
    +++ b/drivers/input/serio/arc_ps2.c
    @@ -8,6 +8,7 @@
    * Driver is originally developed by Pavel Sokolov <psokolov@synopsys.com>
    */

    +#include <linux/err.h>
    #include <linux/module.h>
    #include <linux/interrupt.h>
    #include <linux/input.h>
    @@ -206,9 +207,9 @@ static int arc_ps2_probe(struct platform_device *pdev)
    return -ENOMEM;
    }

    - arc_ps2->addr = devm_request_and_ioremap(&pdev->dev, res);
    - if (!arc_ps2->addr)
    - return -EBUSY;
    + arc_ps2->addr = devm_ioremap_resource(&pdev->dev, res);
    + if (IS_ERR(arc_ps2->addr))
    + return PTR_ERR(arc_ps2->addr);

    dev_info(&pdev->dev, "irq = %d, address = 0x%p, ports = %i\n",
    irq, arc_ps2->addr, ARC_PS2_PORTS);
    --
    1.8.1.1


    \
     
     \ /
      Last update: 2013-01-21 13:43    [W:4.579 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site