Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/net/sfc/spi.h b/drivers/net/sfc/spi.h
index 1b1ceb411671..8bf4fce0813a 100644
--- a/drivers/net/sfc/spi.h
+++ b/drivers/net/sfc/spi.h
@@ -36,8 +36,6 @@
 
 /**
  * struct efx_spi_device - an Efx SPI (Serial Peripheral Interface) device
- * @efx:                The Efx controller that owns this device
- * @mtd:                MTD state
  * @device_id:          Controller's id for the device
  * @size:               Size (in bytes)
  * @addr_len:           Number of address bytes in read/write commands
@@ -54,10 +52,6 @@
  *      Write commands are limited to blocks with this size and alignment.
  */
 struct efx_spi_device {
-        struct efx_nic *efx;
-#ifdef CONFIG_SFC_MTD
-        void *mtd;
-#endif
         int device_id;
         unsigned int size;
         unsigned int addr_len;
@@ -67,12 +61,16 @@ struct efx_spi_device {
         unsigned int block_size;
 };
 
-int falcon_spi_cmd(const struct efx_spi_device *spi, unsigned int command,
+int falcon_spi_cmd(struct efx_nic *efx,
+                   const struct efx_spi_device *spi, unsigned int command,
                    int address, const void* in, void *out, size_t len);
-int falcon_spi_wait_write(const struct efx_spi_device *spi);
-int falcon_spi_read(const struct efx_spi_device *spi, loff_t start,
+int falcon_spi_wait_write(struct efx_nic *efx,
+                          const struct efx_spi_device *spi);
+int falcon_spi_read(struct efx_nic *efx,
+                    const struct efx_spi_device *spi, loff_t start,
                     size_t len, size_t *retlen, u8 *buffer);
-int falcon_spi_write(const struct efx_spi_device *spi, loff_t start,
+int falcon_spi_write(struct efx_nic *efx,
+                     const struct efx_spi_device *spi, loff_t start,
                      size_t len, size_t *retlen, const u8 *buffer);
 
 /*