aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/tenxpress.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-11-23 11:04:23 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-24 13:58:40 -0500
commit981fc1b4b8cc6bfe8c6f0c07052e25738d959c68 (patch)
treeb55aa171ae37e4eff14b6750f61f667a213b518e /drivers/net/sfc/tenxpress.c
parent398468ed1b5c61fe8bcbc8cc1ed323e3c23b58ef (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/tenxpress.c')
-rw-r--r--drivers/net/sfc/tenxpress.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index 6a8e3ea03811..2923e3d1e027 100644
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -303,6 +303,8 @@ static int tenxpress_phy_init(struct efx_nic *efx)
303 u16 old_adv, adv; 303 u16 old_adv, adv;
304 int rc = 0; 304 int rc = 0;
305 305
306 efx->board_info.init_phy(efx);
307
306 phy_data = kzalloc(sizeof(*phy_data), GFP_KERNEL); 308 phy_data = kzalloc(sizeof(*phy_data), GFP_KERNEL);
307 if (!phy_data) 309 if (!phy_data)
308 return -ENOMEM; 310 return -ENOMEM;