diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-23 16:04:23 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-24 10:58:40 -0800 |
| commit | 981fc1b4b8cc6bfe8c6f0c07052e25738d959c68 (patch) | |
| tree | b55aa171ae37e4eff14b6750f61f667a213b518e /drivers/net/sfc/net_driver.h | |
| parent | 398468ed1b5c61fe8bcbc8cc1ed323e3c23b58ef (diff) | |
sfc: Rename efx_board::init_leds to init_phy and use for SFN4111T
efx_board::init_leds was introduced as a second stage of
initialisation because of the inter-dependency between the board and
PHY. We want to move board initialisation into NIC probing, which is
too early to use MDIO, so SFN4111T initialisation also needs to be
split.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/net_driver.h')
| -rw-r--r-- | drivers/net/sfc/net_driver.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index 6b05d69429e..e1df589dff6 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h @@ -399,11 +399,11 @@ enum efx_led_mode { * @type: Board model type * @major: Major rev. ('A', 'B' ...) * @minor: Minor rev. (0, 1, ...) - * @init: Initialisation function - * @init_leds: Sets up board LEDs. May be called repeatedly. + * @init: Allocate resources and initialise peripheral hardware + * @init_phy: Do board-specific PHY initialisation * @set_id_led: Set state of identifying LED or revert to automatic function * @monitor: Board-specific health check function - * @fini: Cleanup function + * @fini: Shut down hardware and free resources * @hwmon_client: I2C client for hardware monitor * @ioexp_client: I2C client for power/port control */ @@ -412,10 +412,7 @@ struct efx_board { int major; int minor; int (*init) (struct efx_nic *nic); - /* As the LEDs are typically attached to the PHY, LEDs - * have a separate init callback that happens later than - * board init. */ - void (*init_leds)(struct efx_nic *efx); + void (*init_phy) (struct efx_nic *efx); void (*set_id_led) (struct efx_nic *efx, enum efx_led_mode mode); int (*monitor) (struct efx_nic *nic); void (*fini) (struct efx_nic *nic); |