diff options
Diffstat (limited to 'drivers/net/sfc')
-rw-r--r-- | drivers/net/sfc/falcon.c | 4 | ||||
-rw-r--r-- | drivers/net/sfc/mcdi.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/mcdi_pcol.h | 6 | ||||
-rw-r--r-- | drivers/net/sfc/mcdi_phy.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/net_driver.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 734fcfb52e85..d96b23769bd1 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c | |||
@@ -692,7 +692,7 @@ static int falcon_gmii_wait(struct efx_nic *efx) | |||
692 | efx_oword_t md_stat; | 692 | efx_oword_t md_stat; |
693 | int count; | 693 | int count; |
694 | 694 | ||
695 | /* wait upto 50ms - taken max from datasheet */ | 695 | /* wait up to 50ms - taken max from datasheet */ |
696 | for (count = 0; count < 5000; count++) { | 696 | for (count = 0; count < 5000; count++) { |
697 | efx_reado(efx, &md_stat, FR_AB_MD_STAT); | 697 | efx_reado(efx, &md_stat, FR_AB_MD_STAT); |
698 | if (EFX_OWORD_FIELD(md_stat, FRF_AB_MD_BSY) == 0) { | 698 | if (EFX_OWORD_FIELD(md_stat, FRF_AB_MD_BSY) == 0) { |
@@ -1221,7 +1221,7 @@ static int falcon_reset_sram(struct efx_nic *efx) | |||
1221 | 1221 | ||
1222 | return 0; | 1222 | return 0; |
1223 | } | 1223 | } |
1224 | } while (++count < 20); /* wait upto 0.4 sec */ | 1224 | } while (++count < 20); /* wait up to 0.4 sec */ |
1225 | 1225 | ||
1226 | netif_err(efx, hw, efx->net_dev, "timed out waiting for SRAM reset\n"); | 1226 | netif_err(efx, hw, efx->net_dev, "timed out waiting for SRAM reset\n"); |
1227 | return -ETIMEDOUT; | 1227 | return -ETIMEDOUT; |
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/sfc/mcdi.c index 5e118f0d2479..d98479030ef2 100644 --- a/drivers/net/sfc/mcdi.c +++ b/drivers/net/sfc/mcdi.c | |||
@@ -453,7 +453,7 @@ static void efx_mcdi_ev_death(struct efx_nic *efx, int rc) | |||
453 | * | 453 | * |
454 | * There's a race here with efx_mcdi_rpc(), because we might receive | 454 | * There's a race here with efx_mcdi_rpc(), because we might receive |
455 | * a REBOOT event *before* the request has been copied out. In polled | 455 | * a REBOOT event *before* the request has been copied out. In polled |
456 | * mode (during startup) this is irrelevent, because efx_mcdi_complete() | 456 | * mode (during startup) this is irrelevant, because efx_mcdi_complete() |
457 | * is ignored. In event mode, this condition is just an edge-case of | 457 | * is ignored. In event mode, this condition is just an edge-case of |
458 | * receiving a REBOOT event after posting the MCDI request. Did the mc | 458 | * receiving a REBOOT event after posting the MCDI request. Did the mc |
459 | * reboot before or after the copyout? The best we can do always is | 459 | * reboot before or after the copyout? The best we can do always is |
diff --git a/drivers/net/sfc/mcdi_pcol.h b/drivers/net/sfc/mcdi_pcol.h index b86a15f221ad..41fe06fa0600 100644 --- a/drivers/net/sfc/mcdi_pcol.h +++ b/drivers/net/sfc/mcdi_pcol.h | |||
@@ -103,7 +103,7 @@ | |||
103 | * | 103 | * |
104 | * If Code==CMDDONE, then the fields are further interpreted as: | 104 | * If Code==CMDDONE, then the fields are further interpreted as: |
105 | * | 105 | * |
106 | * - LEVEL==INFO Command succeded | 106 | * - LEVEL==INFO Command succeeded |
107 | * - LEVEL==ERR Command failed | 107 | * - LEVEL==ERR Command failed |
108 | * | 108 | * |
109 | * 0 8 16 24 32 | 109 | * 0 8 16 24 32 |
@@ -572,7 +572,7 @@ | |||
572 | (4*(_numwords)) | 572 | (4*(_numwords)) |
573 | 573 | ||
574 | /* MC_CMD_SET_RAND_SEED: | 574 | /* MC_CMD_SET_RAND_SEED: |
575 | * Set the 16byte seed for the MC psuedo-random generator | 575 | * Set the 16byte seed for the MC pseudo-random generator |
576 | */ | 576 | */ |
577 | #define MC_CMD_SET_RAND_SEED 0x1a | 577 | #define MC_CMD_SET_RAND_SEED 0x1a |
578 | #define MC_CMD_SET_RAND_SEED_IN_LEN 16 | 578 | #define MC_CMD_SET_RAND_SEED_IN_LEN 16 |
@@ -1162,7 +1162,7 @@ | |||
1162 | #define MC_CMD_MAC_STATS_CMD_CLEAR_WIDTH 1 | 1162 | #define MC_CMD_MAC_STATS_CMD_CLEAR_WIDTH 1 |
1163 | #define MC_CMD_MAC_STATS_CMD_PERIODIC_CHANGE_LBN 2 | 1163 | #define MC_CMD_MAC_STATS_CMD_PERIODIC_CHANGE_LBN 2 |
1164 | #define MC_CMD_MAC_STATS_CMD_PERIODIC_CHANGE_WIDTH 1 | 1164 | #define MC_CMD_MAC_STATS_CMD_PERIODIC_CHANGE_WIDTH 1 |
1165 | /* Remaining PERIOD* fields only relevent when PERIODIC_CHANGE is set */ | 1165 | /* Remaining PERIOD* fields only relevant when PERIODIC_CHANGE is set */ |
1166 | #define MC_CMD_MAC_STATS_CMD_PERIODIC_ENABLE_LBN 3 | 1166 | #define MC_CMD_MAC_STATS_CMD_PERIODIC_ENABLE_LBN 3 |
1167 | #define MC_CMD_MAC_STATS_CMD_PERIODIC_ENABLE_WIDTH 1 | 1167 | #define MC_CMD_MAC_STATS_CMD_PERIODIC_ENABLE_WIDTH 1 |
1168 | #define MC_CMD_MAC_STATS_CMD_PERIODIC_CLEAR_LBN 4 | 1168 | #define MC_CMD_MAC_STATS_CMD_PERIODIC_CLEAR_LBN 4 |
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/sfc/mcdi_phy.c index ec3f740f5465..7e3c65b0c99f 100644 --- a/drivers/net/sfc/mcdi_phy.c +++ b/drivers/net/sfc/mcdi_phy.c | |||
@@ -449,7 +449,7 @@ void efx_mcdi_phy_check_fcntl(struct efx_nic *efx, u32 lpa) | |||
449 | struct efx_mcdi_phy_data *phy_cfg = efx->phy_data; | 449 | struct efx_mcdi_phy_data *phy_cfg = efx->phy_data; |
450 | u32 rmtadv; | 450 | u32 rmtadv; |
451 | 451 | ||
452 | /* The link partner capabilities are only relevent if the | 452 | /* The link partner capabilities are only relevant if the |
453 | * link supports flow control autonegotiation */ | 453 | * link supports flow control autonegotiation */ |
454 | if (~phy_cfg->supported_cap & (1 << MC_CMD_PHY_CAP_AN_LBN)) | 454 | if (~phy_cfg->supported_cap & (1 << MC_CMD_PHY_CAP_AN_LBN)) |
455 | return; | 455 | return; |
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index 215d5c51bfa0..9ffa9a6b55a0 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
@@ -670,7 +670,7 @@ struct efx_filter_state; | |||
670 | * @irq_zero_count: Number of legacy IRQs seen with queue flags == 0 | 670 | * @irq_zero_count: Number of legacy IRQs seen with queue flags == 0 |
671 | * @fatal_irq_level: IRQ level (bit number) used for serious errors | 671 | * @fatal_irq_level: IRQ level (bit number) used for serious errors |
672 | * @mtd_list: List of MTDs attached to the NIC | 672 | * @mtd_list: List of MTDs attached to the NIC |
673 | * @nic_data: Hardware dependant state | 673 | * @nic_data: Hardware dependent state |
674 | * @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode, | 674 | * @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode, |
675 | * @port_inhibited, efx_monitor() and efx_reconfigure_port() | 675 | * @port_inhibited, efx_monitor() and efx_reconfigure_port() |
676 | * @port_enabled: Port enabled indicator. | 676 | * @port_enabled: Port enabled indicator. |