target/linux/mvebu/patches-3.10/0126-mtd-nand-pxa3xx-Remove-unneeded-ifdef-CONFIG_OF.patch

   1 From 1fea4cca22fcb1045a0c1ad42df793e3ea29b5bf Mon Sep 17 00:00:00 2001
   2 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
   3 Date: Mon, 12 Aug 2013 14:14:46 -0300
   4 Subject: [PATCH 126/203] mtd: nand: pxa3xx: Remove unneeded ifdef CONFIG_OF
   5
   6 There's no need to enclose this code within idef CONFIG_OF,
   7 because the OF framework provides no-op stubs if CONFIG_OF=n.
   8
   9 Cc: devicetree@vger.kernel.org
  10 Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  11 Signed-off-by: Brian Norris <computersforpeace@gmail.com>
  12 Signed-off-by: Olof Johansson <olof@lixom.net>
  13 ---
  14  drivers/mtd/nand/pxa3xx_nand.c | 7 -------
  15  1 file changed, 7 deletions(-)
  16
  17 --- a/drivers/mtd/nand/pxa3xx_nand.c
  18 +++ b/drivers/mtd/nand/pxa3xx_nand.c
  19 @@ -1236,7 +1236,6 @@ static int pxa3xx_nand_remove(struct pla
  20         return 0;
  21  }
  22
  23 -#ifdef CONFIG_OF
  24  static struct of_device_id pxa3xx_nand_dt_ids[] = {
  25         {
  26                 .compatible = "marvell,pxa3xx-nand",
  27 @@ -1284,12 +1283,6 @@ static int pxa3xx_nand_probe_dt(struct p
  28
  29         return 0;
  30  }
  31 -#else
  32 -static inline int pxa3xx_nand_probe_dt(struct platform_device *pdev)
  33 -{
  34 -       return 0;
  35 -}
  36 -#endif
  37
  38  static int pxa3xx_nand_probe(struct platform_device *pdev)
  39  {