diff options
Diffstat (limited to 'drivers/net/wireless/p54')
-rw-r--r-- | drivers/net/wireless/p54/p54spi.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c index 9b347cea9854..d5f181ad37fc 100644 --- a/drivers/net/wireless/p54/p54spi.c +++ b/drivers/net/wireless/p54/p54spi.c | |||
@@ -111,15 +111,6 @@ static void p54spi_spi_write(struct p54s_priv *priv, u8 address, | |||
111 | spi_sync(priv->spi, &m); | 111 | spi_sync(priv->spi, &m); |
112 | } | 112 | } |
113 | 113 | ||
114 | static u16 p54spi_read16(struct p54s_priv *priv, u8 addr) | ||
115 | { | ||
116 | __le16 val; | ||
117 | |||
118 | p54spi_spi_read(priv, addr, &val, sizeof(val)); | ||
119 | |||
120 | return le16_to_cpu(val); | ||
121 | } | ||
122 | |||
123 | static u32 p54spi_read32(struct p54s_priv *priv, u8 addr) | 114 | static u32 p54spi_read32(struct p54s_priv *priv, u8 addr) |
124 | { | 115 | { |
125 | __le32 val; | 116 | __le32 val; |
@@ -139,31 +130,6 @@ static inline void p54spi_write32(struct p54s_priv *priv, u8 addr, __le32 val) | |||
139 | p54spi_spi_write(priv, addr, &val, sizeof(val)); | 130 | p54spi_spi_write(priv, addr, &val, sizeof(val)); |
140 | } | 131 | } |
141 | 132 | ||
142 | struct p54spi_spi_reg { | ||
143 | u16 address; /* __le16 ? */ | ||
144 | u16 length; | ||
145 | char *name; | ||
146 | }; | ||
147 | |||
148 | static const struct p54spi_spi_reg p54spi_registers_array[] = | ||
149 | { | ||
150 | { SPI_ADRS_ARM_INTERRUPTS, 32, "ARM_INT " }, | ||
151 | { SPI_ADRS_ARM_INT_EN, 32, "ARM_INT_ENA " }, | ||
152 | { SPI_ADRS_HOST_INTERRUPTS, 32, "HOST_INT " }, | ||
153 | { SPI_ADRS_HOST_INT_EN, 32, "HOST_INT_ENA" }, | ||
154 | { SPI_ADRS_HOST_INT_ACK, 32, "HOST_INT_ACK" }, | ||
155 | { SPI_ADRS_GEN_PURP_1, 32, "GP1_COMM " }, | ||
156 | { SPI_ADRS_GEN_PURP_2, 32, "GP2_COMM " }, | ||
157 | { SPI_ADRS_DEV_CTRL_STAT, 32, "DEV_CTRL_STA" }, | ||
158 | { SPI_ADRS_DMA_DATA, 16, "DMA_DATA " }, | ||
159 | { SPI_ADRS_DMA_WRITE_CTRL, 16, "DMA_WR_CTRL " }, | ||
160 | { SPI_ADRS_DMA_WRITE_LEN, 16, "DMA_WR_LEN " }, | ||
161 | { SPI_ADRS_DMA_WRITE_BASE, 32, "DMA_WR_BASE " }, | ||
162 | { SPI_ADRS_DMA_READ_CTRL, 16, "DMA_RD_CTRL " }, | ||
163 | { SPI_ADRS_DMA_READ_LEN, 16, "DMA_RD_LEN " }, | ||
164 | { SPI_ADRS_DMA_WRITE_BASE, 32, "DMA_RD_BASE " } | ||
165 | }; | ||
166 | |||
167 | static int p54spi_wait_bit(struct p54s_priv *priv, u16 reg, u32 bits) | 133 | static int p54spi_wait_bit(struct p54s_priv *priv, u16 reg, u32 bits) |
168 | { | 134 | { |
169 | int i; | 135 | int i; |