]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: netlogic: Simplify use of devm_ioremap_resource
authorAmitoj Kaur Chawla <amitoj1606@gmail.com>
Tue, 23 Feb 2016 16:42:16 +0000 (22:12 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 12 Mar 2016 06:09:09 +0000 (22:09 -0800)
Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to
devm_ioremap_resource.

The Coccinelle semantic patch that makes this change is as follows:

// <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: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/netlogic/xlr_net.c

index 00158471a7f62e82b632f2c8842d6c68f23007ec..3a6de47461dc0967bd9fd89eacf8690175cba518 100644 (file)
@@ -1038,13 +1038,6 @@ static int xlr_net_probe(struct platform_device *pdev)
                priv->port_id = (pdev->id * 4) + port;
                priv->nd = (struct xlr_net_data *)pdev->dev.platform_data;
                res = platform_get_resource(pdev, IORESOURCE_MEM, port);
-
-               if (res == NULL) {
-                       pr_err("No memory resource for MAC %d\n",
-                              priv->port_id);
-                       err = -ENODEV;
-                       goto err_gmac;
-               }
                priv->base_addr = devm_ioremap_resource(&pdev->dev, res);
                if (IS_ERR(priv->base_addr)) {
                        err = PTR_ERR(priv->base_addr);