target/linux/brcm47xx/patches-3.10/077-MIPS-BCM47XX-fix-sparse-warnings-in-board.c.patch

   1 From ab76ce5c01293f518db823c7089d52586fc1d899 Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Fri, 3 Jan 2014 20:42:00 +0100
   4 Subject: [PATCH] MIPS: BCM47XX: fix sparse warnings in board.c
   5
   6 This fixes the following sparse warnings:
   7 arch/mips/bcm47xx/board.c:39:16: warning: Using plain integer as NULL pointer
   8 arch/mips/bcm47xx/board.c:46:16: warning: Using plain integer as NULL pointer
   9 arch/mips/bcm47xx/board.c:53:16: warning: Using plain integer as NULL pointer
  10 arch/mips/bcm47xx/board.c:78:16: warning: Using plain integer as NULL pointer
  11 arch/mips/bcm47xx/board.c:99:16: warning: Using plain integer as NULL pointer
  12 arch/mips/bcm47xx/board.c:109:16: warning: Using plain integer as NULL pointer
  13 arch/mips/bcm47xx/board.c:124:16: warning: Using plain integer as NULL pointer
  14 arch/mips/bcm47xx/board.c:155:16: warning: Using plain integer as NULL pointer
  15 arch/mips/bcm47xx/board.c:177:16: warning: Using plain integer as NULL pointer
  16 arch/mips/bcm47xx/board.c:189:16: warning: Using plain integer as NULL pointer
  17
  18 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  19 Acked-by: Rafa? Mi?ecki <zajec5@gmail.com>
  20 ---
  21  arch/mips/bcm47xx/board.c |   20 ++++++++++----------
  22  1 file changed, 10 insertions(+), 10 deletions(-)
  23
  24 --- a/arch/mips/bcm47xx/board.c
  25 +++ b/arch/mips/bcm47xx/board.c
  26 @@ -36,21 +36,21 @@ static const
  27  struct bcm47xx_board_type_list1 bcm47xx_board_list_model_name[] __initconst = {
  28         {{BCM47XX_BOARD_DLINK_DIR130, "D-Link DIR-130"}, "DIR-130"},
  29         {{BCM47XX_BOARD_DLINK_DIR330, "D-Link DIR-330"}, "DIR-330"},
  30 -       { {0}, 0},
  31 +       { {0}, NULL},
  32  };
  33
  34  /* model_no */
  35  static const
  36  struct bcm47xx_board_type_list1 bcm47xx_board_list_model_no[] __initconst = {
  37         {{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "WL700"},
  38 -       { {0}, 0},
  39 +       { {0}, NULL},
  40  };
  41
  42  /* machine_name */
  43  static const
  44  struct bcm47xx_board_type_list1 bcm47xx_board_list_machine_name[] __initconst = {
  45         {{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "WRTSL54GS"},
  46 -       { {0}, 0},
  47 +       { {0}, NULL},
  48  };
  49
  50  /* hardware_version */
  51 @@ -72,7 +72,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
  52         {{BCM47XX_BOARD_ASUS_WL520GC, "Asus WL520GC"}, "WL520GC-"},
  53         {{BCM47XX_BOARD_ASUS_WL520GU, "Asus WL520GU"}, "WL520GU-"},
  54         {{BCM47XX_BOARD_BELKIN_F7D4301, "Belkin F7D4301"}, "F7D4301"},
  55 -       { {0}, 0},
  56 +       { {0}, NULL},
  57  };
  58
  59  /* productid */
  60 @@ -87,7 +87,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
  61         {{BCM47XX_BOARD_ASUS_RTN66U, "Asus RT-N66U"}, "RT-N66U"},
  62         {{BCM47XX_BOARD_ASUS_WL300G, "Asus WL300G"}, "WL300g"},
  63         {{BCM47XX_BOARD_ASUS_WLHDD, "Asus WLHDD"}, "WLHDD"},
  64 -       { {0}, 0},
  65 +       { {0}, NULL},
  66  };
  67
  68  /* ModelId */
  69 @@ -97,7 +97,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
  70         {{BCM47XX_BOARD_MOTOROLA_WE800G, "Motorola WE800G"}, "WE800G"},
  71         {{BCM47XX_BOARD_MOTOROLA_WR850GP, "Motorola WR850GP"}, "WR850GP"},
  72         {{BCM47XX_BOARD_MOTOROLA_WR850GV2V3, "Motorola WR850G"}, "WR850G"},
  73 -       { {0}, 0},
  74 +       { {0}, NULL},
  75  };
  76
  77  /* melco_id or buf1falo_id */
  78 @@ -112,7 +112,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
  79         {{BCM47XX_BOARD_BUFFALO_WZR_G300N, "Buffalo WZR-G300N"}, "31120"},
  80         {{BCM47XX_BOARD_BUFFALO_WZR_RS_G54, "Buffalo WZR-RS-G54"}, "30083"},
  81         {{BCM47XX_BOARD_BUFFALO_WZR_RS_G54HP, "Buffalo WZR-RS-G54HP"}, "30103"},
  82 -       { {0}, 0},
  83 +       { {0}, NULL},
  84  };
  85
  86  /* boot_hw_model, boot_hw_ver */
  87 @@ -143,7 +143,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
  88         {{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"},
  89         {{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"},
  90         {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"},
  91 -       { {0}, 0},
  92 +       { {0}, NULL},
  93  };
  94
  95  /* board_id */
  96 @@ -165,7 +165,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
  97         {{BCM47XX_BOARD_NETGEAR_WNR3500V2, "Netgear WNR3500 V2"}, "U12H127T00_NETGEAR"},
  98         {{BCM47XX_BOARD_NETGEAR_WNR3500V2VC, "Netgear WNR3500 V2vc"}, "U12H127T70_NETGEAR"},
  99         {{BCM47XX_BOARD_NETGEAR_WNR834BV2, "Netgear WNR834B V2"}, "U12H081T00_NETGEAR"},
 100 -       { {0}, 0},
 101 +       { {0}, NULL},
 102  };
 103
 104  /* boardtype, boardnum, boardrev */
 105 @@ -176,7 +176,7 @@ struct bcm47xx_board_type_list3 bcm47xx_
 106         {{BCM47XX_BOARD_ZTE_H218N, "ZTE H218N"}, "0x053d", "1234", "0x1305"},
 107         {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "0x04CF", "3500", "02"},
 108         {{BCM47XX_BOARD_LINKSYS_WRT54GSV1, "Linksys WRT54GS V1"}, "0x0101", "42", "0x10"},
 109 -       { {0}, 0},
 110 +       { {0}, NULL},
 111  };
 112
 113  static const