113 lines
4.3 KiB
Diff
113 lines
4.3 KiB
Diff
From ab76ce5c01293f518db823c7089d52586fc1d899 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Fri, 3 Jan 2014 20:42:00 +0100
|
|
Subject: [PATCH] MIPS: BCM47XX: fix sparse warnings in board.c
|
|
|
|
This fixes the following sparse warnings:
|
|
arch/mips/bcm47xx/board.c:39:16: warning: Using plain integer as NULL pointer
|
|
arch/mips/bcm47xx/board.c:46:16: warning: Using plain integer as NULL pointer
|
|
arch/mips/bcm47xx/board.c:53:16: warning: Using plain integer as NULL pointer
|
|
arch/mips/bcm47xx/board.c:78:16: warning: Using plain integer as NULL pointer
|
|
arch/mips/bcm47xx/board.c:99:16: warning: Using plain integer as NULL pointer
|
|
arch/mips/bcm47xx/board.c:109:16: warning: Using plain integer as NULL pointer
|
|
arch/mips/bcm47xx/board.c:124:16: warning: Using plain integer as NULL pointer
|
|
arch/mips/bcm47xx/board.c:155:16: warning: Using plain integer as NULL pointer
|
|
arch/mips/bcm47xx/board.c:177:16: warning: Using plain integer as NULL pointer
|
|
arch/mips/bcm47xx/board.c:189:16: warning: Using plain integer as NULL pointer
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Acked-by: Rafa? Mi?ecki <zajec5@gmail.com>
|
|
---
|
|
arch/mips/bcm47xx/board.c | 20 ++++++++++----------
|
|
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
--- a/arch/mips/bcm47xx/board.c
|
|
+++ b/arch/mips/bcm47xx/board.c
|
|
@@ -36,21 +36,21 @@ static const
|
|
struct bcm47xx_board_type_list1 bcm47xx_board_list_model_name[] __initconst = {
|
|
{{BCM47XX_BOARD_DLINK_DIR130, "D-Link DIR-130"}, "DIR-130"},
|
|
{{BCM47XX_BOARD_DLINK_DIR330, "D-Link DIR-330"}, "DIR-330"},
|
|
- { {0}, 0},
|
|
+ { {0}, NULL},
|
|
};
|
|
|
|
/* model_no */
|
|
static const
|
|
struct bcm47xx_board_type_list1 bcm47xx_board_list_model_no[] __initconst = {
|
|
{{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "WL700"},
|
|
- { {0}, 0},
|
|
+ { {0}, NULL},
|
|
};
|
|
|
|
/* machine_name */
|
|
static const
|
|
struct bcm47xx_board_type_list1 bcm47xx_board_list_machine_name[] __initconst = {
|
|
{{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "WRTSL54GS"},
|
|
- { {0}, 0},
|
|
+ { {0}, NULL},
|
|
};
|
|
|
|
/* hardware_version */
|
|
@@ -72,7 +72,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
|
|
{{BCM47XX_BOARD_ASUS_WL520GC, "Asus WL520GC"}, "WL520GC-"},
|
|
{{BCM47XX_BOARD_ASUS_WL520GU, "Asus WL520GU"}, "WL520GU-"},
|
|
{{BCM47XX_BOARD_BELKIN_F7D4301, "Belkin F7D4301"}, "F7D4301"},
|
|
- { {0}, 0},
|
|
+ { {0}, NULL},
|
|
};
|
|
|
|
/* productid */
|
|
@@ -87,7 +87,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
|
|
{{BCM47XX_BOARD_ASUS_RTN66U, "Asus RT-N66U"}, "RT-N66U"},
|
|
{{BCM47XX_BOARD_ASUS_WL300G, "Asus WL300G"}, "WL300g"},
|
|
{{BCM47XX_BOARD_ASUS_WLHDD, "Asus WLHDD"}, "WLHDD"},
|
|
- { {0}, 0},
|
|
+ { {0}, NULL},
|
|
};
|
|
|
|
/* ModelId */
|
|
@@ -97,7 +97,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
|
|
{{BCM47XX_BOARD_MOTOROLA_WE800G, "Motorola WE800G"}, "WE800G"},
|
|
{{BCM47XX_BOARD_MOTOROLA_WR850GP, "Motorola WR850GP"}, "WR850GP"},
|
|
{{BCM47XX_BOARD_MOTOROLA_WR850GV2V3, "Motorola WR850G"}, "WR850G"},
|
|
- { {0}, 0},
|
|
+ { {0}, NULL},
|
|
};
|
|
|
|
/* melco_id or buf1falo_id */
|
|
@@ -112,7 +112,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
|
|
{{BCM47XX_BOARD_BUFFALO_WZR_G300N, "Buffalo WZR-G300N"}, "31120"},
|
|
{{BCM47XX_BOARD_BUFFALO_WZR_RS_G54, "Buffalo WZR-RS-G54"}, "30083"},
|
|
{{BCM47XX_BOARD_BUFFALO_WZR_RS_G54HP, "Buffalo WZR-RS-G54HP"}, "30103"},
|
|
- { {0}, 0},
|
|
+ { {0}, NULL},
|
|
};
|
|
|
|
/* boot_hw_model, boot_hw_ver */
|
|
@@ -143,7 +143,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
|
|
{{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"},
|
|
{{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"},
|
|
{{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"},
|
|
- { {0}, 0},
|
|
+ { {0}, NULL},
|
|
};
|
|
|
|
/* board_id */
|
|
@@ -165,7 +165,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
|
|
{{BCM47XX_BOARD_NETGEAR_WNR3500V2, "Netgear WNR3500 V2"}, "U12H127T00_NETGEAR"},
|
|
{{BCM47XX_BOARD_NETGEAR_WNR3500V2VC, "Netgear WNR3500 V2vc"}, "U12H127T70_NETGEAR"},
|
|
{{BCM47XX_BOARD_NETGEAR_WNR834BV2, "Netgear WNR834B V2"}, "U12H081T00_NETGEAR"},
|
|
- { {0}, 0},
|
|
+ { {0}, NULL},
|
|
};
|
|
|
|
/* boardtype, boardnum, boardrev */
|
|
@@ -176,7 +176,7 @@ struct bcm47xx_board_type_list3 bcm47xx_
|
|
{{BCM47XX_BOARD_ZTE_H218N, "ZTE H218N"}, "0x053d", "1234", "0x1305"},
|
|
{{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "0x04CF", "3500", "02"},
|
|
{{BCM47XX_BOARD_LINKSYS_WRT54GSV1, "Linksys WRT54GS V1"}, "0x0101", "42", "0x10"},
|
|
- { {0}, 0},
|
|
+ { {0}, NULL},
|
|
};
|
|
|
|
static const
|