lkml.org 
[lkml]   [2013]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/29] watchdog: s3c2410_wdt: simplify use of devm_ioremap_resource
    Date
    From: Julia Lawall <Julia.Lawall@lip6.fr>

    Remove unneeded error handling on the result of a call to
    platform_get_resource when the value is passed to devm_ioremap_resource.

    Move the call to platform_get_resource adjacent to the call to
    devm_ioremap_resource to make the connection between them more clear.

    A simplified version of the semantic patch that makes this change is as
    follows: (http://coccinelle.lip6.fr/)

    // <smpl>
    @@
    expression pdev,res,n,e,e1;
    expression ret != 0;
    identifier l;
    @@

    - res = platform_get_resource(pdev, IORESOURCE_MEM, n);
    ... when != res
    - if (res == NULL) { ... \(goto l;\|return ret;\) }
    ... when != res
    + res = platform_get_resource(pdev, IORESOURCE_MEM, n);
    e = devm_ioremap_resource(e1, res);
    // </smpl>

    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

    ---
    drivers/watchdog/s3c2410_wdt.c | 7 +------
    1 file changed, 1 insertion(+), 6 deletions(-)

    diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
    index 6a22cf5..9fbc993 100644
    --- a/drivers/watchdog/s3c2410_wdt.c
    +++ b/drivers/watchdog/s3c2410_wdt.c
    @@ -325,12 +325,6 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
    dev = &pdev->dev;
    wdt_dev = &pdev->dev;

    - wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    - if (wdt_mem == NULL) {
    - dev_err(dev, "no memory resource specified\n");
    - return -ENOENT;
    - }
    -
    wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
    if (wdt_irq == NULL) {
    dev_err(dev, "no irq resource specified\n");
    @@ -339,6 +333,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
    }

    /* get the memory region for the watchdog timer */
    + wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    wdt_base = devm_ioremap_resource(dev, wdt_mem);
    if (IS_ERR(wdt_base)) {
    ret = PTR_ERR(wdt_base);


    \
     
     \ /
      Last update: 2013-08-15 19:01    [W:3.868 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site