mtd: txx9ndfmc: use devm_request_and_ioremap
authorJulia Lawall <julia@diku.dk>
Tue, 27 Dec 2011 14:01:31 +0000 (15:01 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 9 Jan 2012 18:24:11 +0000 (18:24 +0000)
Reimplement a call to devm_request_mem_region followed by a call to ioremap
or ioremap_nocache by a call to devm_request_and_ioremap.

The semantic patch that makes this transformation is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@nm@
expression myname;
identifier i;
@@

struct platform_driver i = { .driver = { .name = myname } };

@@
expression dev,res,size;
expression nm.myname;
@@

-if (!devm_request_mem_region(dev, res->start, size,
-                              \(res->name\|dev_name(dev)\|myname\))) {
-   ...
-   return ...;
-}
... when != res->start
(
-devm_ioremap(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
|
-devm_ioremap_nocache(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
)
... when any
    when != res->start
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/nand/txx9ndfmc.c

index ace46fdaef58cfb3b51fc9c981e637bb7e0fd2a4..c7c4f1d11c77f2f9cb1a41700f58549377d5ea64 100644 (file)
@@ -298,11 +298,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
        drvdata = devm_kzalloc(&dev->dev, sizeof(*drvdata), GFP_KERNEL);
        if (!drvdata)
                return -ENOMEM;
-       if (!devm_request_mem_region(&dev->dev, res->start,
-                                    resource_size(res), dev_name(&dev->dev)))
-               return -EBUSY;
-       drvdata->base = devm_ioremap(&dev->dev, res->start,
-                                    resource_size(res));
+       drvdata->base = devm_request_and_ioremap(&dev->dev, res);
        if (!drvdata->base)
                return -EBUSY;