diff options
| author | Tom Rini <[email protected]> | 2023-01-10 11:19:45 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-01-20 12:27:24 -0500 |
| commit | 6e7df1d151a7a127caf3b62ff6dfc003fc2aefcd (patch) | |
| tree | ae38e9dcf468b2e4e58293561fae87895d9b549f /drivers/net/eepro100.c | |
| parent | ad242344681f6a0076a6bf100aa83ac9ecbea355 (diff) | |
global: Finish CONFIG -> CFG migration
At this point, the remaining places where we have a symbol that is
defined as CONFIG_... are in fairly odd locations. While as much dead
code has been removed as possible, some of these locations are simply
less obvious at first. In other cases, this code is used, but was
defined in such a way as to have been missed by earlier checks. Perform
a rename of all such remaining symbols to be CFG_... rather than
CONFIG_...
Signed-off-by: Tom Rini <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Diffstat (limited to 'drivers/net/eepro100.c')
| -rw-r--r-- | drivers/net/eepro100.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 0a1fe560910..38d96ab72b6 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -168,12 +168,12 @@ struct descriptor { /* A generic descriptor. */ unsigned char params[0]; }; -#define CONFIG_SYS_CMD_SUSPEND 0x4000 -#define CONFIG_SYS_CMD_IAS 0x0001 /* individual address setup */ -#define CONFIG_SYS_CMD_CONFIGURE 0x0002 /* configure */ +#define CFG_SYS_CMD_SUSPEND 0x4000 +#define CFG_SYS_CMD_IAS 0x0001 /* individual address setup */ +#define CFG_SYS_CMD_CONFIGURE 0x0002 /* configure */ -#define CONFIG_SYS_STATUS_C 0x8000 -#define CONFIG_SYS_STATUS_OK 0x2000 +#define CFG_SYS_STATUS_C 0x8000 +#define CFG_SYS_STATUS_OK 0x2000 /* Misc. */ #define NUM_RX_DESC PKTBUFSRX @@ -411,7 +411,7 @@ static int eepro100_txcmd_send(struct eepro100_priv *priv, invalidate_dcache_range((unsigned long)desc, (unsigned long)desc + sizeof(*desc)); rstat = le16_to_cpu(desc->status); - if (rstat & CONFIG_SYS_STATUS_C) + if (rstat & CFG_SYS_STATUS_C) break; if (i++ >= TOUT_LOOP) { @@ -424,7 +424,7 @@ static int eepro100_txcmd_send(struct eepro100_priv *priv, (unsigned long)desc + sizeof(*desc)); rstat = le16_to_cpu(desc->status); - if (!(rstat & CONFIG_SYS_STATUS_OK)) { + if (!(rstat & CFG_SYS_STATUS_OK)) { printf("TX error status = 0x%08X\n", rstat); return -EIO; } @@ -577,8 +577,8 @@ static int eepro100_init_common(struct eepro100_priv *priv) priv->tx_next = ((priv->tx_next + 1) % NUM_TX_DESC); cfg_cmd = &tx_ring[tx_cur]; - cfg_cmd->command = cpu_to_le16(CONFIG_SYS_CMD_SUSPEND | - CONFIG_SYS_CMD_CONFIGURE); + cfg_cmd->command = cpu_to_le16(CFG_SYS_CMD_SUSPEND | + CFG_SYS_CMD_CONFIGURE); cfg_cmd->status = 0; cfg_cmd->link = cpu_to_le32(phys_to_bus(priv->devno, (u32)&tx_ring[priv->tx_next])); @@ -589,7 +589,7 @@ static int eepro100_init_common(struct eepro100_priv *priv) ret = eepro100_txcmd_send(priv, cfg_cmd); if (ret) { if (ret == -ETIMEDOUT) - printf("Error---CONFIG_SYS_CMD_CONFIGURE: Can not reset ethernet controller.\n"); + printf("Error---CFG_SYS_CMD_CONFIGURE: Can not reset ethernet controller.\n"); goto done; } @@ -598,8 +598,8 @@ static int eepro100_init_common(struct eepro100_priv *priv) priv->tx_next = ((priv->tx_next + 1) % NUM_TX_DESC); ias_cmd = &tx_ring[tx_cur]; - ias_cmd->command = cpu_to_le16(CONFIG_SYS_CMD_SUSPEND | - CONFIG_SYS_CMD_IAS); + ias_cmd->command = cpu_to_le16(CFG_SYS_CMD_SUSPEND | + CFG_SYS_CMD_IAS); ias_cmd->status = 0; ias_cmd->link = cpu_to_le32(phys_to_bus(priv->devno, (u32)&tx_ring[priv->tx_next])); |