target/linux/ar71xx/patches-3.10/101-MIPS-ath79-simplify-platform_get_resource_byname-dev.patch

   1 From 59a93f8909b8ab5d61e024e8b3771fdf94a774f0 Mon Sep 17 00:00:00 2001
   2 From: Julia Lawall <Julia.Lawall@lip6.fr>
   3 Date: Mon, 19 Aug 2013 10:51:56 +0200
   4 Subject: [PATCH] MIPS: ath79: simplify platform_get_resource_byname/devm_ioremap_resource
   5
   6 Remove unneeded error handling on the result of a call to
   7 platform_get_resource_byname when the value is passed to devm_ioremap_resource.
   8
   9 A simplified version of the semantic patch that makes this change is as
  10 follows: (http://coccinelle.lip6.fr/)
  11
  12 // <smpl>
  13 @@
  14 expression pdev,res,e,e1;
  15 expression ret != 0;
  16 identifier l;
  17 @@
  18
  19   res = platform_get_resource_byname(...);
  20 - if (res == NULL) { ... \(goto l;\|return ret;\) }
  21   e = devm_ioremap_resource(e1, res);
  22 // </smpl>
  23
  24 Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
  25 Acked-by: Gabor Juhos <juhosg@openwrt.org>
  26 ---
  27  arch/mips/pci/pci-ar71xx.c |    3 ---
  28  arch/mips/pci/pci-ar724x.c |    9 ---------
  29  2 files changed, 12 deletions(-)
  30
  31 --- a/arch/mips/pci/pci-ar71xx.c
  32 +++ b/arch/mips/pci/pci-ar71xx.c
  33 @@ -363,9 +363,6 @@ static int ar71xx_pci_probe(struct platf
  34         spin_lock_init(&apc->lock);
  35
  36         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_base");
  37 -       if (!res)
  38 -               return -EINVAL;
  39 -
  40         apc->cfg_base = devm_ioremap_resource(&pdev->dev, res);
  41         if (IS_ERR(apc->cfg_base))
  42                 return PTR_ERR(apc->cfg_base);
  43 --- a/arch/mips/pci/pci-ar724x.c
  44 +++ b/arch/mips/pci/pci-ar724x.c
  45 @@ -362,25 +362,16 @@ static int ar724x_pci_probe(struct platf
  46                 return -ENOMEM;
  47
  48         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl_base");
  49 -       if (!res)
  50 -               return -EINVAL;
  51 -
  52         apc->ctrl_base = devm_ioremap_resource(&pdev->dev, res);
  53         if (IS_ERR(apc->ctrl_base))
  54                 return PTR_ERR(apc->ctrl_base);
  55
  56         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_base");
  57 -       if (!res)
  58 -               return -EINVAL;
  59 -
  60         apc->devcfg_base = devm_ioremap_resource(&pdev->dev, res);
  61         if (IS_ERR(apc->devcfg_base))
  62                 return PTR_ERR(apc->devcfg_base);
  63
  64         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "crp_base");
  65 -       if (!res)
  66 -               return -EINVAL;
  67 -
  68         apc->crp_base = devm_ioremap_resource(&pdev->dev, res);
  69         if (IS_ERR(apc->crp_base))
  70                 return PTR_ERR(apc->crp_base);