diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-25 16:09:41 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-26 23:59:16 (GMT) |
| commit | 44838a447de3b1541cbf845853c4f8999310b0dd (patch) | |
| tree | 53d5f1b0a6ad773764c7f97eb1d48619e781a67f /drivers/net/sfc/falcon.c | |
| parent | 734a350a6ccee59647f064fd49cd6cebc5dda48b (diff) | |
| download | linux-44838a447de3b1541cbf845853c4f8999310b0dd.tar.xz | |
sfc: Clean up struct falcon_board and struct falcon_board_data
Put all static information in struct falcon_board_type and replace it
with a pointer in struct falcon_board. Simplify probing aocordingly.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon.c')
| -rw-r--r-- | drivers/net/sfc/falcon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 2c0be6c..2f1f1fc 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c @@ -2864,7 +2864,7 @@ int falcon_probe_nic(struct efx_nic *efx) if (rc) goto fail5; - rc = falcon_board(efx)->init(efx); + rc = falcon_board(efx)->type->init(efx); if (rc) { EFX_ERR(efx, "failed to initialise board\n"); goto fail6; @@ -3067,7 +3067,7 @@ void falcon_remove_nic(struct efx_nic *efx) struct falcon_board *board = falcon_board(efx); int rc; - falcon_board(efx)->fini(efx); + board->type->fini(efx); /* Remove I2C adapter and clear it in preparation for a retry */ rc = i2c_del_adapter(&board->i2c_adap); |