diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2008-09-01 12:48:36 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-03 09:53:47 -0400 |
| commit | 01aad7b6ffcc07544e7bdf472fbde4e6eb36a610 (patch) | |
| tree | aa17e0be6f3cb75705d89b62c975823eef5abb3f /drivers/net/sfc | |
| parent | 740847dab16b1a410a0f833df2bf21c8ed8265f3 (diff) | |
| download | linux-3.10-01aad7b6ffcc07544e7bdf472fbde4e6eb36a610.tar.gz linux-3.10-01aad7b6ffcc07544e7bdf472fbde4e6eb36a610.tar.bz2 linux-3.10-01aad7b6ffcc07544e7bdf472fbde4e6eb36a610.zip | |
sfc: Remove efx_nic_dummy_op_int() as redundant with efx_port_dummy_op_int()
Update comment on the dummy operation implementations.
Line up the board operation initialisers.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/sfc')
| -rw-r--r-- | drivers/net/sfc/efx.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 5a0494a7d59..c41035a9938 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@ -1774,7 +1774,7 @@ static struct pci_device_id efx_pci_table[] __devinitdata = { * * Dummy PHY/MAC/Board operations * - * Can be used where the MAC does not implement this operation + * Can be used for some unimplemented operations * Needed so all function pointers are valid and do not have to be tested * before use * @@ -1795,17 +1795,12 @@ static struct efx_phy_operations efx_dummy_phy_operations = { .reset_xaui = efx_port_dummy_op_void, }; -/* Dummy board operations */ -static int efx_nic_dummy_op_int(struct efx_nic *nic) -{ - return 0; -} - static struct efx_board efx_dummy_board_info = { - .init = efx_nic_dummy_op_int, - .init_leds = efx_port_dummy_op_int, - .set_fault_led = efx_port_dummy_op_blink, - .fini = efx_port_dummy_op_void, + .init = efx_port_dummy_op_int, + .init_leds = efx_port_dummy_op_int, + .set_fault_led = efx_port_dummy_op_blink, + .blink = efx_port_dummy_op_blink, + .fini = efx_port_dummy_op_void, }; /************************************************************************** |