Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

net: stmmac: xgmac: use const char arrays for string constants

Jiri Slaby advises me that the preferred mechanism for declaring
string constants is static char arrays, so use that here.

This mostly reverts
commit 1692b9775e74 ("net: stmmac: xgmac: use #define for string constants")

That commit was a fix for
commit 46eba193d04f ("net: stmmac: xgmac: fix handling of DPP safety error for DMA channels").
The fix being replacing const char * with #defines in order to address
compilation failures observed on GCC 6 through 10.

Compile tested only.
No functional change intended.

Suggested-by: Jiri Slaby <jirislaby@kernel.org>
Link: https://lore.kernel.org/netdev/485dbc5a-a04b-40c2-9481-955eaa5ce2e2@kernel.org/
Signed-off-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Simon Horman and committed by
David S. Miller
36fb5147 2524d6c2

+34 -35
+34 -35
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
··· 846 846 { false, "UNKNOWN", "Unknown Error" }, /* 31 */ 847 847 }; 848 848 849 - #define DPP_RX_ERR "Read Rx Descriptor Parity checker Error" 850 - #define DPP_TX_ERR "Read Tx Descriptor Parity checker Error" 851 - 849 + static const char dpp_rx_err[] = "Read Rx Descriptor Parity checker Error"; 850 + static const char dpp_tx_err[] = "Read Tx Descriptor Parity checker Error"; 852 851 static const struct dwxgmac3_error_desc dwxgmac3_dma_dpp_errors[32] = { 853 - { true, "TDPES0", DPP_TX_ERR }, 854 - { true, "TDPES1", DPP_TX_ERR }, 855 - { true, "TDPES2", DPP_TX_ERR }, 856 - { true, "TDPES3", DPP_TX_ERR }, 857 - { true, "TDPES4", DPP_TX_ERR }, 858 - { true, "TDPES5", DPP_TX_ERR }, 859 - { true, "TDPES6", DPP_TX_ERR }, 860 - { true, "TDPES7", DPP_TX_ERR }, 861 - { true, "TDPES8", DPP_TX_ERR }, 862 - { true, "TDPES9", DPP_TX_ERR }, 863 - { true, "TDPES10", DPP_TX_ERR }, 864 - { true, "TDPES11", DPP_TX_ERR }, 865 - { true, "TDPES12", DPP_TX_ERR }, 866 - { true, "TDPES13", DPP_TX_ERR }, 867 - { true, "TDPES14", DPP_TX_ERR }, 868 - { true, "TDPES15", DPP_TX_ERR }, 869 - { true, "RDPES0", DPP_RX_ERR }, 870 - { true, "RDPES1", DPP_RX_ERR }, 871 - { true, "RDPES2", DPP_RX_ERR }, 872 - { true, "RDPES3", DPP_RX_ERR }, 873 - { true, "RDPES4", DPP_RX_ERR }, 874 - { true, "RDPES5", DPP_RX_ERR }, 875 - { true, "RDPES6", DPP_RX_ERR }, 876 - { true, "RDPES7", DPP_RX_ERR }, 877 - { true, "RDPES8", DPP_RX_ERR }, 878 - { true, "RDPES9", DPP_RX_ERR }, 879 - { true, "RDPES10", DPP_RX_ERR }, 880 - { true, "RDPES11", DPP_RX_ERR }, 881 - { true, "RDPES12", DPP_RX_ERR }, 882 - { true, "RDPES13", DPP_RX_ERR }, 883 - { true, "RDPES14", DPP_RX_ERR }, 884 - { true, "RDPES15", DPP_RX_ERR }, 852 + { true, "TDPES0", dpp_tx_err }, 853 + { true, "TDPES1", dpp_tx_err }, 854 + { true, "TDPES2", dpp_tx_err }, 855 + { true, "TDPES3", dpp_tx_err }, 856 + { true, "TDPES4", dpp_tx_err }, 857 + { true, "TDPES5", dpp_tx_err }, 858 + { true, "TDPES6", dpp_tx_err }, 859 + { true, "TDPES7", dpp_tx_err }, 860 + { true, "TDPES8", dpp_tx_err }, 861 + { true, "TDPES9", dpp_tx_err }, 862 + { true, "TDPES10", dpp_tx_err }, 863 + { true, "TDPES11", dpp_tx_err }, 864 + { true, "TDPES12", dpp_tx_err }, 865 + { true, "TDPES13", dpp_tx_err }, 866 + { true, "TDPES14", dpp_tx_err }, 867 + { true, "TDPES15", dpp_tx_err }, 868 + { true, "RDPES0", dpp_rx_err }, 869 + { true, "RDPES1", dpp_rx_err }, 870 + { true, "RDPES2", dpp_rx_err }, 871 + { true, "RDPES3", dpp_rx_err }, 872 + { true, "RDPES4", dpp_rx_err }, 873 + { true, "RDPES5", dpp_rx_err }, 874 + { true, "RDPES6", dpp_rx_err }, 875 + { true, "RDPES7", dpp_rx_err }, 876 + { true, "RDPES8", dpp_rx_err }, 877 + { true, "RDPES9", dpp_rx_err }, 878 + { true, "RDPES10", dpp_rx_err }, 879 + { true, "RDPES11", dpp_rx_err }, 880 + { true, "RDPES12", dpp_rx_err }, 881 + { true, "RDPES13", dpp_rx_err }, 882 + { true, "RDPES14", dpp_rx_err }, 883 + { true, "RDPES15", dpp_rx_err }, 885 884 }; 886 885 887 886 static void dwxgmac3_handle_dma_err(struct net_device *ndev,