diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-02 14:47:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-03 18:08:07 +0100 |
| commit | 4de92180258ac661bbce0f0065c9c81633ac862b (patch) | |
| tree | bb58aecb8e7e52dd2f95daa53ab263ccd98b9374 /drivers/net/sfc/net_driver.h | |
| parent | sfc: Remove unnecessary inclusion of various private header files (diff) | |
| download | linux-4de92180258ac661bbce0f0065c9c81633ac862b.tar.xz linux-4de92180258ac661bbce0f0065c9c81633ac862b.zip | |
sfc: Move SPI state to struct falcon_nic_data
We only have direct access to SPI on Falcon, so move all this state
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/net_driver.h')
| -rw-r--r-- | drivers/net/sfc/net_driver.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index 0a7e26d73b52..e5ee2d53750e 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h @@ -657,11 +657,6 @@ struct efx_filter_state; * to verify that an interrupt has occurred. * @irq_zero_count: Number of legacy IRQs seen with queue flags == 0 * @fatal_irq_level: IRQ level (bit number) used for serious errors - * @spi_flash: SPI flash device - * This field will be %NULL if no flash device is present (or for Siena). - * @spi_eeprom: SPI EEPROM device - * This field will be %NULL if no EEPROM device is present (or for Siena). - * @spi_lock: SPI bus lock * @mtd_list: List of MTDs attached to the NIC * @n_rx_nodesc_drop_cnt: RX no descriptor drop count * @nic_data: Hardware dependant state @@ -746,9 +741,6 @@ struct efx_nic { unsigned irq_zero_count; unsigned fatal_irq_level; - struct efx_spi_device *spi_flash; - struct efx_spi_device *spi_eeprom; - struct mutex spi_lock; #ifdef CONFIG_SFC_MTD struct list_head mtd_list; #endif |