diff options
author | Joe Perches <joe@perches.com> | 2010-12-14 16:36:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-16 16:16:03 -0500 |
commit | 005b5717faac22264c1f61908ec5ac5b98108d99 (patch) | |
tree | 423982dddf8f2a730d087ba0ee6e6a47261c3a8f /drivers/net/cxgb4 | |
parent | 8f3a76769ee50a839282f70d07d5f3429524b68a (diff) |
cxgb4: add const to static arrays
Patch originally from Joe Perches, unmodified.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dimitris Michailidis <dm@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb4')
-rw-r--r-- | drivers/net/cxgb4/t4_hw.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c index 6af04520fa06..c7fb549776dc 100644 --- a/drivers/net/cxgb4/t4_hw.c +++ b/drivers/net/cxgb4/t4_hw.c | |||
@@ -183,7 +183,7 @@ static void dump_mbox(struct adapter *adap, int mbox, u32 data_reg) | |||
183 | int t4_wr_mbox_meat(struct adapter *adap, int mbox, const void *cmd, int size, | 183 | int t4_wr_mbox_meat(struct adapter *adap, int mbox, const void *cmd, int size, |
184 | void *rpl, bool sleep_ok) | 184 | void *rpl, bool sleep_ok) |
185 | { | 185 | { |
186 | static int delay[] = { | 186 | static const int delay[] = { |
187 | 1, 1, 3, 5, 10, 10, 20, 50, 100, 200 | 187 | 1, 1, 3, 5, 10, 10, 20, 50, 100, 200 |
188 | }; | 188 | }; |
189 | 189 | ||
@@ -917,7 +917,7 @@ static int t4_handle_intr_status(struct adapter *adapter, unsigned int reg, | |||
917 | */ | 917 | */ |
918 | static void pcie_intr_handler(struct adapter *adapter) | 918 | static void pcie_intr_handler(struct adapter *adapter) |
919 | { | 919 | { |
920 | static struct intr_info sysbus_intr_info[] = { | 920 | static const struct intr_info sysbus_intr_info[] = { |
921 | { RNPP, "RXNP array parity error", -1, 1 }, | 921 | { RNPP, "RXNP array parity error", -1, 1 }, |
922 | { RPCP, "RXPC array parity error", -1, 1 }, | 922 | { RPCP, "RXPC array parity error", -1, 1 }, |
923 | { RCIP, "RXCIF array parity error", -1, 1 }, | 923 | { RCIP, "RXCIF array parity error", -1, 1 }, |
@@ -925,7 +925,7 @@ static void pcie_intr_handler(struct adapter *adapter) | |||
925 | { RFTP, "RXFT array parity error", -1, 1 }, | 925 | { RFTP, "RXFT array parity error", -1, 1 }, |
926 | { 0 } | 926 | { 0 } |
927 | }; | 927 | }; |
928 | static struct intr_info pcie_port_intr_info[] = { | 928 | static const struct intr_info pcie_port_intr_info[] = { |
929 | { TPCP, "TXPC array parity error", -1, 1 }, | 929 | { TPCP, "TXPC array parity error", -1, 1 }, |
930 | { TNPP, "TXNP array parity error", -1, 1 }, | 930 | { TNPP, "TXNP array parity error", -1, 1 }, |
931 | { TFTP, "TXFT array parity error", -1, 1 }, | 931 | { TFTP, "TXFT array parity error", -1, 1 }, |
@@ -937,7 +937,7 @@ static void pcie_intr_handler(struct adapter *adapter) | |||
937 | { TDUE, "Tx uncorrectable data error", -1, 1 }, | 937 | { TDUE, "Tx uncorrectable data error", -1, 1 }, |
938 | { 0 } | 938 | { 0 } |
939 | }; | 939 | }; |
940 | static struct intr_info pcie_intr_info[] = { | 940 | static const struct intr_info pcie_intr_info[] = { |
941 | { MSIADDRLPERR, "MSI AddrL parity error", -1, 1 }, | 941 | { MSIADDRLPERR, "MSI AddrL parity error", -1, 1 }, |
942 | { MSIADDRHPERR, "MSI AddrH parity error", -1, 1 }, | 942 | { MSIADDRHPERR, "MSI AddrH parity error", -1, 1 }, |
943 | { MSIDATAPERR, "MSI data parity error", -1, 1 }, | 943 | { MSIDATAPERR, "MSI data parity error", -1, 1 }, |
@@ -989,7 +989,7 @@ static void pcie_intr_handler(struct adapter *adapter) | |||
989 | */ | 989 | */ |
990 | static void tp_intr_handler(struct adapter *adapter) | 990 | static void tp_intr_handler(struct adapter *adapter) |
991 | { | 991 | { |
992 | static struct intr_info tp_intr_info[] = { | 992 | static const struct intr_info tp_intr_info[] = { |
993 | { 0x3fffffff, "TP parity error", -1, 1 }, | 993 | { 0x3fffffff, "TP parity error", -1, 1 }, |
994 | { FLMTXFLSTEMPTY, "TP out of Tx pages", -1, 1 }, | 994 | { FLMTXFLSTEMPTY, "TP out of Tx pages", -1, 1 }, |
995 | { 0 } | 995 | { 0 } |
@@ -1006,7 +1006,7 @@ static void sge_intr_handler(struct adapter *adapter) | |||
1006 | { | 1006 | { |
1007 | u64 v; | 1007 | u64 v; |
1008 | 1008 | ||
1009 | static struct intr_info sge_intr_info[] = { | 1009 | static const struct intr_info sge_intr_info[] = { |
1010 | { ERR_CPL_EXCEED_IQE_SIZE, | 1010 | { ERR_CPL_EXCEED_IQE_SIZE, |
1011 | "SGE received CPL exceeding IQE size", -1, 1 }, | 1011 | "SGE received CPL exceeding IQE size", -1, 1 }, |
1012 | { ERR_INVALID_CIDX_INC, | 1012 | { ERR_INVALID_CIDX_INC, |
@@ -1051,7 +1051,7 @@ static void sge_intr_handler(struct adapter *adapter) | |||
1051 | */ | 1051 | */ |
1052 | static void cim_intr_handler(struct adapter *adapter) | 1052 | static void cim_intr_handler(struct adapter *adapter) |
1053 | { | 1053 | { |
1054 | static struct intr_info cim_intr_info[] = { | 1054 | static const struct intr_info cim_intr_info[] = { |
1055 | { PREFDROPINT, "CIM control register prefetch drop", -1, 1 }, | 1055 | { PREFDROPINT, "CIM control register prefetch drop", -1, 1 }, |
1056 | { OBQPARERR, "CIM OBQ parity error", -1, 1 }, | 1056 | { OBQPARERR, "CIM OBQ parity error", -1, 1 }, |
1057 | { IBQPARERR, "CIM IBQ parity error", -1, 1 }, | 1057 | { IBQPARERR, "CIM IBQ parity error", -1, 1 }, |
@@ -1061,7 +1061,7 @@ static void cim_intr_handler(struct adapter *adapter) | |||
1061 | { TIEQOUTPARERRINT, "CIM TIEQ incoming parity error", -1, 1 }, | 1061 | { TIEQOUTPARERRINT, "CIM TIEQ incoming parity error", -1, 1 }, |
1062 | { 0 } | 1062 | { 0 } |
1063 | }; | 1063 | }; |
1064 | static struct intr_info cim_upintr_info[] = { | 1064 | static const struct intr_info cim_upintr_info[] = { |
1065 | { RSVDSPACEINT, "CIM reserved space access", -1, 1 }, | 1065 | { RSVDSPACEINT, "CIM reserved space access", -1, 1 }, |
1066 | { ILLTRANSINT, "CIM illegal transaction", -1, 1 }, | 1066 | { ILLTRANSINT, "CIM illegal transaction", -1, 1 }, |
1067 | { ILLWRINT, "CIM illegal write", -1, 1 }, | 1067 | { ILLWRINT, "CIM illegal write", -1, 1 }, |
@@ -1108,7 +1108,7 @@ static void cim_intr_handler(struct adapter *adapter) | |||
1108 | */ | 1108 | */ |
1109 | static void ulprx_intr_handler(struct adapter *adapter) | 1109 | static void ulprx_intr_handler(struct adapter *adapter) |
1110 | { | 1110 | { |
1111 | static struct intr_info ulprx_intr_info[] = { | 1111 | static const struct intr_info ulprx_intr_info[] = { |
1112 | { 0x1800000, "ULPRX context error", -1, 1 }, | 1112 | { 0x1800000, "ULPRX context error", -1, 1 }, |
1113 | { 0x7fffff, "ULPRX parity error", -1, 1 }, | 1113 | { 0x7fffff, "ULPRX parity error", -1, 1 }, |
1114 | { 0 } | 1114 | { 0 } |
@@ -1123,7 +1123,7 @@ static void ulprx_intr_handler(struct adapter *adapter) | |||
1123 | */ | 1123 | */ |
1124 | static void ulptx_intr_handler(struct adapter *adapter) | 1124 | static void ulptx_intr_handler(struct adapter *adapter) |
1125 | { | 1125 | { |
1126 | static struct intr_info ulptx_intr_info[] = { | 1126 | static const struct intr_info ulptx_intr_info[] = { |
1127 | { PBL_BOUND_ERR_CH3, "ULPTX channel 3 PBL out of bounds", -1, | 1127 | { PBL_BOUND_ERR_CH3, "ULPTX channel 3 PBL out of bounds", -1, |
1128 | 0 }, | 1128 | 0 }, |
1129 | { PBL_BOUND_ERR_CH2, "ULPTX channel 2 PBL out of bounds", -1, | 1129 | { PBL_BOUND_ERR_CH2, "ULPTX channel 2 PBL out of bounds", -1, |
@@ -1145,7 +1145,7 @@ static void ulptx_intr_handler(struct adapter *adapter) | |||
1145 | */ | 1145 | */ |
1146 | static void pmtx_intr_handler(struct adapter *adapter) | 1146 | static void pmtx_intr_handler(struct adapter *adapter) |
1147 | { | 1147 | { |
1148 | static struct intr_info pmtx_intr_info[] = { | 1148 | static const struct intr_info pmtx_intr_info[] = { |
1149 | { PCMD_LEN_OVFL0, "PMTX channel 0 pcmd too large", -1, 1 }, | 1149 | { PCMD_LEN_OVFL0, "PMTX channel 0 pcmd too large", -1, 1 }, |
1150 | { PCMD_LEN_OVFL1, "PMTX channel 1 pcmd too large", -1, 1 }, | 1150 | { PCMD_LEN_OVFL1, "PMTX channel 1 pcmd too large", -1, 1 }, |
1151 | { PCMD_LEN_OVFL2, "PMTX channel 2 pcmd too large", -1, 1 }, | 1151 | { PCMD_LEN_OVFL2, "PMTX channel 2 pcmd too large", -1, 1 }, |
@@ -1167,7 +1167,7 @@ static void pmtx_intr_handler(struct adapter *adapter) | |||
1167 | */ | 1167 | */ |
1168 | static void pmrx_intr_handler(struct adapter *adapter) | 1168 | static void pmrx_intr_handler(struct adapter *adapter) |
1169 | { | 1169 | { |
1170 | static struct intr_info pmrx_intr_info[] = { | 1170 | static const struct intr_info pmrx_intr_info[] = { |
1171 | { ZERO_E_CMD_ERROR, "PMRX 0-length pcmd", -1, 1 }, | 1171 | { ZERO_E_CMD_ERROR, "PMRX 0-length pcmd", -1, 1 }, |
1172 | { PMRX_FRAMING_ERROR, "PMRX framing error", -1, 1 }, | 1172 | { PMRX_FRAMING_ERROR, "PMRX framing error", -1, 1 }, |
1173 | { OCSPI_PAR_ERROR, "PMRX ocspi parity error", -1, 1 }, | 1173 | { OCSPI_PAR_ERROR, "PMRX ocspi parity error", -1, 1 }, |
@@ -1186,7 +1186,7 @@ static void pmrx_intr_handler(struct adapter *adapter) | |||
1186 | */ | 1186 | */ |
1187 | static void cplsw_intr_handler(struct adapter *adapter) | 1187 | static void cplsw_intr_handler(struct adapter *adapter) |
1188 | { | 1188 | { |
1189 | static struct intr_info cplsw_intr_info[] = { | 1189 | static const struct intr_info cplsw_intr_info[] = { |
1190 | { CIM_OP_MAP_PERR, "CPLSW CIM op_map parity error", -1, 1 }, | 1190 | { CIM_OP_MAP_PERR, "CPLSW CIM op_map parity error", -1, 1 }, |
1191 | { CIM_OVFL_ERROR, "CPLSW CIM overflow", -1, 1 }, | 1191 | { CIM_OVFL_ERROR, "CPLSW CIM overflow", -1, 1 }, |
1192 | { TP_FRAMING_ERROR, "CPLSW TP framing error", -1, 1 }, | 1192 | { TP_FRAMING_ERROR, "CPLSW TP framing error", -1, 1 }, |
@@ -1205,7 +1205,7 @@ static void cplsw_intr_handler(struct adapter *adapter) | |||
1205 | */ | 1205 | */ |
1206 | static void le_intr_handler(struct adapter *adap) | 1206 | static void le_intr_handler(struct adapter *adap) |
1207 | { | 1207 | { |
1208 | static struct intr_info le_intr_info[] = { | 1208 | static const struct intr_info le_intr_info[] = { |
1209 | { LIPMISS, "LE LIP miss", -1, 0 }, | 1209 | { LIPMISS, "LE LIP miss", -1, 0 }, |
1210 | { LIP0, "LE 0 LIP error", -1, 0 }, | 1210 | { LIP0, "LE 0 LIP error", -1, 0 }, |
1211 | { PARITYERR, "LE parity error", -1, 1 }, | 1211 | { PARITYERR, "LE parity error", -1, 1 }, |
@@ -1223,11 +1223,11 @@ static void le_intr_handler(struct adapter *adap) | |||
1223 | */ | 1223 | */ |
1224 | static void mps_intr_handler(struct adapter *adapter) | 1224 | static void mps_intr_handler(struct adapter *adapter) |
1225 | { | 1225 | { |
1226 | static struct intr_info mps_rx_intr_info[] = { | 1226 | static const struct intr_info mps_rx_intr_info[] = { |
1227 | { 0xffffff, "MPS Rx parity error", -1, 1 }, | 1227 | { 0xffffff, "MPS Rx parity error", -1, 1 }, |
1228 | { 0 } | 1228 | { 0 } |
1229 | }; | 1229 | }; |
1230 | static struct intr_info mps_tx_intr_info[] = { | 1230 | static const struct intr_info mps_tx_intr_info[] = { |
1231 | { TPFIFO, "MPS Tx TP FIFO parity error", -1, 1 }, | 1231 | { TPFIFO, "MPS Tx TP FIFO parity error", -1, 1 }, |
1232 | { NCSIFIFO, "MPS Tx NC-SI FIFO parity error", -1, 1 }, | 1232 | { NCSIFIFO, "MPS Tx NC-SI FIFO parity error", -1, 1 }, |
1233 | { TXDATAFIFO, "MPS Tx data FIFO parity error", -1, 1 }, | 1233 | { TXDATAFIFO, "MPS Tx data FIFO parity error", -1, 1 }, |
@@ -1237,25 +1237,25 @@ static void mps_intr_handler(struct adapter *adapter) | |||
1237 | { FRMERR, "MPS Tx framing error", -1, 1 }, | 1237 | { FRMERR, "MPS Tx framing error", -1, 1 }, |
1238 | { 0 } | 1238 | { 0 } |
1239 | }; | 1239 | }; |
1240 | static struct intr_info mps_trc_intr_info[] = { | 1240 | static const struct intr_info mps_trc_intr_info[] = { |
1241 | { FILTMEM, "MPS TRC filter parity error", -1, 1 }, | 1241 | { FILTMEM, "MPS TRC filter parity error", -1, 1 }, |
1242 | { PKTFIFO, "MPS TRC packet FIFO parity error", -1, 1 }, | 1242 | { PKTFIFO, "MPS TRC packet FIFO parity error", -1, 1 }, |
1243 | { MISCPERR, "MPS TRC misc parity error", -1, 1 }, | 1243 | { MISCPERR, "MPS TRC misc parity error", -1, 1 }, |
1244 | { 0 } | 1244 | { 0 } |
1245 | }; | 1245 | }; |
1246 | static struct intr_info mps_stat_sram_intr_info[] = { | 1246 | static const struct intr_info mps_stat_sram_intr_info[] = { |
1247 | { 0x1fffff, "MPS statistics SRAM parity error", -1, 1 }, | 1247 | { 0x1fffff, "MPS statistics SRAM parity error", -1, 1 }, |
1248 | { 0 } | 1248 | { 0 } |
1249 | }; | 1249 | }; |
1250 | static struct intr_info mps_stat_tx_intr_info[] = { | 1250 | static const struct intr_info mps_stat_tx_intr_info[] = { |
1251 | { 0xfffff, "MPS statistics Tx FIFO parity error", -1, 1 }, | 1251 | { 0xfffff, "MPS statistics Tx FIFO parity error", -1, 1 }, |
1252 | { 0 } | 1252 | { 0 } |
1253 | }; | 1253 | }; |
1254 | static struct intr_info mps_stat_rx_intr_info[] = { | 1254 | static const struct intr_info mps_stat_rx_intr_info[] = { |
1255 | { 0xffffff, "MPS statistics Rx FIFO parity error", -1, 1 }, | 1255 | { 0xffffff, "MPS statistics Rx FIFO parity error", -1, 1 }, |
1256 | { 0 } | 1256 | { 0 } |
1257 | }; | 1257 | }; |
1258 | static struct intr_info mps_cls_intr_info[] = { | 1258 | static const struct intr_info mps_cls_intr_info[] = { |
1259 | { MATCHSRAM, "MPS match SRAM parity error", -1, 1 }, | 1259 | { MATCHSRAM, "MPS match SRAM parity error", -1, 1 }, |
1260 | { MATCHTCAM, "MPS match TCAM parity error", -1, 1 }, | 1260 | { MATCHTCAM, "MPS match TCAM parity error", -1, 1 }, |
1261 | { HASHSRAM, "MPS hash SRAM parity error", -1, 1 }, | 1261 | { HASHSRAM, "MPS hash SRAM parity error", -1, 1 }, |
@@ -1354,7 +1354,7 @@ static void ma_intr_handler(struct adapter *adap) | |||
1354 | */ | 1354 | */ |
1355 | static void smb_intr_handler(struct adapter *adap) | 1355 | static void smb_intr_handler(struct adapter *adap) |
1356 | { | 1356 | { |
1357 | static struct intr_info smb_intr_info[] = { | 1357 | static const struct intr_info smb_intr_info[] = { |
1358 | { MSTTXFIFOPARINT, "SMB master Tx FIFO parity error", -1, 1 }, | 1358 | { MSTTXFIFOPARINT, "SMB master Tx FIFO parity error", -1, 1 }, |
1359 | { MSTRXFIFOPARINT, "SMB master Rx FIFO parity error", -1, 1 }, | 1359 | { MSTRXFIFOPARINT, "SMB master Rx FIFO parity error", -1, 1 }, |
1360 | { SLVFIFOPARINT, "SMB slave FIFO parity error", -1, 1 }, | 1360 | { SLVFIFOPARINT, "SMB slave FIFO parity error", -1, 1 }, |
@@ -1370,7 +1370,7 @@ static void smb_intr_handler(struct adapter *adap) | |||
1370 | */ | 1370 | */ |
1371 | static void ncsi_intr_handler(struct adapter *adap) | 1371 | static void ncsi_intr_handler(struct adapter *adap) |
1372 | { | 1372 | { |
1373 | static struct intr_info ncsi_intr_info[] = { | 1373 | static const struct intr_info ncsi_intr_info[] = { |
1374 | { CIM_DM_PRTY_ERR, "NC-SI CIM parity error", -1, 1 }, | 1374 | { CIM_DM_PRTY_ERR, "NC-SI CIM parity error", -1, 1 }, |
1375 | { MPS_DM_PRTY_ERR, "NC-SI MPS parity error", -1, 1 }, | 1375 | { MPS_DM_PRTY_ERR, "NC-SI MPS parity error", -1, 1 }, |
1376 | { TXFIFO_PRTY_ERR, "NC-SI Tx FIFO parity error", -1, 1 }, | 1376 | { TXFIFO_PRTY_ERR, "NC-SI Tx FIFO parity error", -1, 1 }, |
@@ -1408,7 +1408,7 @@ static void xgmac_intr_handler(struct adapter *adap, int port) | |||
1408 | */ | 1408 | */ |
1409 | static void pl_intr_handler(struct adapter *adap) | 1409 | static void pl_intr_handler(struct adapter *adap) |
1410 | { | 1410 | { |
1411 | static struct intr_info pl_intr_info[] = { | 1411 | static const struct intr_info pl_intr_info[] = { |
1412 | { FATALPERR, "T4 fatal parity error", -1, 1 }, | 1412 | { FATALPERR, "T4 fatal parity error", -1, 1 }, |
1413 | { PERRVFID, "PL VFID_MAP parity error", -1, 1 }, | 1413 | { PERRVFID, "PL VFID_MAP parity error", -1, 1 }, |
1414 | { 0 } | 1414 | { 0 } |