Skip to content

Commit

Permalink
sfc: Change type of efx_nic::nic_data to struct falcon_nic_data *
Browse files Browse the repository at this point in the history
Remove redundant casts and variable.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Ben Hutchings authored and Jeff Garzik committed May 22, 2008
1 parent 24c28ed commit 5daab96
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 1 addition & 4 deletions drivers/net/sfc/falcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -2411,7 +2411,7 @@ int falcon_probe_nic(struct efx_nic *efx)

/* Allocate storage for hardware specific data */
nic_data = kzalloc(sizeof(*nic_data), GFP_KERNEL);
efx->nic_data = (void *) nic_data;
efx->nic_data = nic_data;

/* Determine number of ports etc. */
rc = falcon_probe_nic_variant(efx);
Expand Down Expand Up @@ -2481,13 +2481,10 @@ int falcon_probe_nic(struct efx_nic *efx)
*/
int falcon_init_nic(struct efx_nic *efx)
{
struct falcon_nic_data *data;
efx_oword_t temp;
unsigned thresh;
int rc;

data = (struct falcon_nic_data *)efx->nic_data;

/* Set up the address region register. This is only needed
* for the B0 FPGA, but since we are just pushing in the
* reset defaults this may as well be unconditional. */
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/sfc/net_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ struct efx_nic {

unsigned n_rx_nodesc_drop_cnt;

void *nic_data;
struct falcon_nic_data *nic_data;

struct mutex mac_lock;
int port_enabled;
Expand Down

0 comments on commit 5daab96

Please sign in to comment.