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/nic.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/nic.h')
| -rw-r--r-- | drivers/net/sfc/nic.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/sfc/nic.h b/drivers/net/sfc/nic.h index 0438dc98722d..2a0fff324f1f 100644 --- a/drivers/net/sfc/nic.h +++ b/drivers/net/sfc/nic.h @@ -15,6 +15,7 @@ #include "net_driver.h" #include "efx.h" #include "mcdi.h" +#include "spi.h" /* * Falcon hardware control @@ -113,6 +114,9 @@ struct falcon_board { * @stats_pending: Is there a pending DMA of MAC statistics. * @stats_timer: A timer for regularly fetching MAC statistics. * @stats_dma_done: Pointer to the flag which indicates DMA completion. + * @spi_flash: SPI flash device + * @spi_eeprom: SPI EEPROM device + * @spi_lock: SPI bus lock */ struct falcon_nic_data { struct pci_dev *pci_dev2; @@ -121,6 +125,9 @@ struct falcon_nic_data { bool stats_pending; struct timer_list stats_timer; u32 *stats_dma_done; + struct efx_spi_device spi_flash; + struct efx_spi_device spi_eeprom; + struct mutex spi_lock; }; static inline struct falcon_board *falcon_board(struct efx_nic *efx) |