Commit 5daab96d authored by Ben Hutchings's avatar Ben Hutchings Committed by Jeff Garzik

sfc: Change type of efx_nic::nic_data to struct falcon_nic_data *

Remove redundant casts and variable.
Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 24c28edc
...@@ -2411,7 +2411,7 @@ int falcon_probe_nic(struct efx_nic *efx) ...@@ -2411,7 +2411,7 @@ int falcon_probe_nic(struct efx_nic *efx)
/* Allocate storage for hardware specific data */ /* Allocate storage for hardware specific data */
nic_data = kzalloc(sizeof(*nic_data), GFP_KERNEL); nic_data = kzalloc(sizeof(*nic_data), GFP_KERNEL);
efx->nic_data = (void *) nic_data; efx->nic_data = nic_data;
/* Determine number of ports etc. */ /* Determine number of ports etc. */
rc = falcon_probe_nic_variant(efx); rc = falcon_probe_nic_variant(efx);
...@@ -2481,13 +2481,10 @@ int falcon_probe_nic(struct efx_nic *efx) ...@@ -2481,13 +2481,10 @@ int falcon_probe_nic(struct efx_nic *efx)
*/ */
int falcon_init_nic(struct efx_nic *efx) int falcon_init_nic(struct efx_nic *efx)
{ {
struct falcon_nic_data *data;
efx_oword_t temp; efx_oword_t temp;
unsigned thresh; unsigned thresh;
int rc; int rc;
data = (struct falcon_nic_data *)efx->nic_data;
/* Set up the address region register. This is only needed /* Set up the address region register. This is only needed
* for the B0 FPGA, but since we are just pushing in the * for the B0 FPGA, but since we are just pushing in the
* reset defaults this may as well be unconditional. */ * reset defaults this may as well be unconditional. */
......
...@@ -705,7 +705,7 @@ struct efx_nic { ...@@ -705,7 +705,7 @@ struct efx_nic {
unsigned n_rx_nodesc_drop_cnt; unsigned n_rx_nodesc_drop_cnt;
void *nic_data; struct falcon_nic_data *nic_data;
struct mutex mac_lock; struct mutex mac_lock;
int port_enabled; int port_enabled;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment