aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/sfc/falcon.c5
-rw-r--r--drivers/net/sfc/net_driver.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 475b596383cd..ac14460e3558 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -2411,7 +2411,7 @@ int falcon_probe_nic(struct efx_nic *efx)
2411 2411
2412 /* Allocate storage for hardware specific data */ 2412 /* Allocate storage for hardware specific data */
2413 nic_data = kzalloc(sizeof(*nic_data), GFP_KERNEL); 2413 nic_data = kzalloc(sizeof(*nic_data), GFP_KERNEL);
2414 efx->nic_data = (void *) nic_data; 2414 efx->nic_data = nic_data;
2415 2415
2416 /* Determine number of ports etc. */ 2416 /* Determine number of ports etc. */
2417 rc = falcon_probe_nic_variant(efx); 2417 rc = falcon_probe_nic_variant(efx);
@@ -2481,13 +2481,10 @@ int falcon_probe_nic(struct efx_nic *efx)
2481 */ 2481 */
2482int falcon_init_nic(struct efx_nic *efx) 2482int falcon_init_nic(struct efx_nic *efx)
2483{ 2483{
2484 struct falcon_nic_data *data;
2485 efx_oword_t temp; 2484 efx_oword_t temp;
2486 unsigned thresh; 2485 unsigned thresh;
2487 int rc; 2486 int rc;
2488 2487
2489 data = (struct falcon_nic_data *)efx->nic_data;
2490
2491 /* Set up the address region register. This is only needed 2488 /* Set up the address region register. This is only needed
2492 * for the B0 FPGA, but since we are just pushing in the 2489 * for the B0 FPGA, but since we are just pushing in the
2493 * reset defaults this may as well be unconditional. */ 2490 * reset defaults this may as well be unconditional. */
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index be09180ca39d..f4757e16484b 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -705,7 +705,7 @@ struct efx_nic {
705 705
706 unsigned n_rx_nodesc_drop_cnt; 706 unsigned n_rx_nodesc_drop_cnt;
707 707
708 void *nic_data; 708 struct falcon_nic_data *nic_data;
709 709
710 struct mutex mac_lock; 710 struct mutex mac_lock;
711 int port_enabled; 711 int port_enabled;