Skip to content

Commit f30e532

Browse files
ColinIanKingPaolo Abeni
authored andcommitted
net: dsa: sja1105: make read-only const arrays static
Don't populate read-only const arrays on the stack, instead make them static. Signed-off-by: Colin Ian King <colin.i.king@gmail.com> Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> Link: https://lore.kernel.org/r/20230919093606.24446-1-colin.i.king@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent f20161c commit f30e532

1 file changed

Lines changed: 13 additions & 8 deletions

File tree

drivers/net/dsa/sja1105/sja1105_clocking.c

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,14 @@ static int sja1105_cgu_mii_tx_clk_config(struct sja1105_private *priv,
153153
{
154154
const struct sja1105_regs *regs = priv->info->regs;
155155
struct sja1105_cgu_mii_ctrl mii_tx_clk;
156-
const int mac_clk_sources[] = {
156+
static const int mac_clk_sources[] = {
157157
CLKSRC_MII0_TX_CLK,
158158
CLKSRC_MII1_TX_CLK,
159159
CLKSRC_MII2_TX_CLK,
160160
CLKSRC_MII3_TX_CLK,
161161
CLKSRC_MII4_TX_CLK,
162162
};
163-
const int phy_clk_sources[] = {
163+
static const int phy_clk_sources[] = {
164164
CLKSRC_IDIV0,
165165
CLKSRC_IDIV1,
166166
CLKSRC_IDIV2,
@@ -194,7 +194,7 @@ sja1105_cgu_mii_rx_clk_config(struct sja1105_private *priv, int port)
194194
const struct sja1105_regs *regs = priv->info->regs;
195195
struct sja1105_cgu_mii_ctrl mii_rx_clk;
196196
u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};
197-
const int clk_sources[] = {
197+
static const int clk_sources[] = {
198198
CLKSRC_MII0_RX_CLK,
199199
CLKSRC_MII1_RX_CLK,
200200
CLKSRC_MII2_RX_CLK,
@@ -221,7 +221,7 @@ sja1105_cgu_mii_ext_tx_clk_config(struct sja1105_private *priv, int port)
221221
const struct sja1105_regs *regs = priv->info->regs;
222222
struct sja1105_cgu_mii_ctrl mii_ext_tx_clk;
223223
u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};
224-
const int clk_sources[] = {
224+
static const int clk_sources[] = {
225225
CLKSRC_IDIV0,
226226
CLKSRC_IDIV1,
227227
CLKSRC_IDIV2,
@@ -248,7 +248,7 @@ sja1105_cgu_mii_ext_rx_clk_config(struct sja1105_private *priv, int port)
248248
const struct sja1105_regs *regs = priv->info->regs;
249249
struct sja1105_cgu_mii_ctrl mii_ext_rx_clk;
250250
u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};
251-
const int clk_sources[] = {
251+
static const int clk_sources[] = {
252252
CLKSRC_IDIV0,
253253
CLKSRC_IDIV1,
254254
CLKSRC_IDIV2,
@@ -349,8 +349,13 @@ static int sja1105_cgu_rgmii_tx_clk_config(struct sja1105_private *priv,
349349
if (speed == priv->info->port_speed[SJA1105_SPEED_1000MBPS]) {
350350
clksrc = CLKSRC_PLL0;
351351
} else {
352-
int clk_sources[] = {CLKSRC_IDIV0, CLKSRC_IDIV1, CLKSRC_IDIV2,
353-
CLKSRC_IDIV3, CLKSRC_IDIV4};
352+
static const int clk_sources[] = {
353+
CLKSRC_IDIV0,
354+
CLKSRC_IDIV1,
355+
CLKSRC_IDIV2,
356+
CLKSRC_IDIV3,
357+
CLKSRC_IDIV4,
358+
};
354359
clksrc = clk_sources[port];
355360
}
356361

@@ -638,7 +643,7 @@ static int sja1105_cgu_rmii_ref_clk_config(struct sja1105_private *priv,
638643
const struct sja1105_regs *regs = priv->info->regs;
639644
struct sja1105_cgu_mii_ctrl ref_clk;
640645
u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};
641-
const int clk_sources[] = {
646+
static const int clk_sources[] = {
642647
CLKSRC_MII0_TX_CLK,
643648
CLKSRC_MII1_TX_CLK,
644649
CLKSRC_MII2_TX_CLK,

0 commit comments

Comments
 (0)