diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2008-05-16 16:19:43 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-05-22 05:59:32 -0400 |
commit | 5daab96d873721cb84f4583f232b88fcd67c51fb (patch) | |
tree | d947a060c590db080f68cfd4d3f405a037b9f670 /drivers/net/sfc/falcon.c | |
parent | 24c28edc5a1b1dc4677eb13408ff3492d65df159 (diff) |
sfc: Change type of efx_nic::nic_data to struct falcon_nic_data *
Remove redundant casts and variable.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/sfc/falcon.c')
-rw-r--r-- | drivers/net/sfc/falcon.c | 5 |
1 files changed, 1 insertions, 4 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 | */ |
2482 | int falcon_init_nic(struct efx_nic *efx) | 2482 | int 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. */ |