diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-02 08:47:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-03 12:08:08 -0500 |
commit | 4833f02a2972b7da4c8a15e1e329db0f984a75d9 (patch) | |
tree | d23e8b733fb02507b6894d632270dcb0435e6890 /drivers/net/sfc/nic.h | |
parent | 4de92180258ac661bbce0f0065c9c81633ac862b (diff) |
sfc: Move mdio_lock to struct falcon_nic_data
We only have direct access to MDIO on Falcon, so move this out of
struct efx_nic.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/nic.h')
-rw-r--r-- | drivers/net/sfc/nic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sfc/nic.h b/drivers/net/sfc/nic.h index 2a0fff324f1f..980cf4b5a868 100644 --- a/drivers/net/sfc/nic.h +++ b/drivers/net/sfc/nic.h | |||
@@ -117,6 +117,7 @@ struct falcon_board { | |||
117 | * @spi_flash: SPI flash device | 117 | * @spi_flash: SPI flash device |
118 | * @spi_eeprom: SPI EEPROM device | 118 | * @spi_eeprom: SPI EEPROM device |
119 | * @spi_lock: SPI bus lock | 119 | * @spi_lock: SPI bus lock |
120 | * @mdio_lock: MDIO bus lock | ||
120 | */ | 121 | */ |
121 | struct falcon_nic_data { | 122 | struct falcon_nic_data { |
122 | struct pci_dev *pci_dev2; | 123 | struct pci_dev *pci_dev2; |
@@ -128,6 +129,7 @@ struct falcon_nic_data { | |||
128 | struct efx_spi_device spi_flash; | 129 | struct efx_spi_device spi_flash; |
129 | struct efx_spi_device spi_eeprom; | 130 | struct efx_spi_device spi_eeprom; |
130 | struct mutex spi_lock; | 131 | struct mutex spi_lock; |
132 | struct mutex mdio_lock; | ||
131 | }; | 133 | }; |
132 | 134 | ||
133 | static inline struct falcon_board *falcon_board(struct efx_nic *efx) | 135 | static inline struct falcon_board *falcon_board(struct efx_nic *efx) |