diff options
author | Matthew Leach <matthew@mattleach.net> | 2012-12-10 04:12:37 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-10 15:46:27 -0500 |
commit | daadaf6f69c4e26ceb421f2b96eade3809260c7f (patch) | |
tree | ac47a0e98273e709613389e7c98d0f05e8d382a7 /drivers/net/ethernet/davicom/dm9000.c | |
parent | 4ba73aa1c9223f8f0dd5bb358dfea70309672d99 (diff) |
net: dm9000: use io{read,write}*_rep accessors
The {read,write}s{b,w,l} operations are not defined by all
architectures and are being removed from the asm-generic/io.h
interface.
This patch replaces the usage of these string functions in the default
DM9000 accessors with io{read,write}{8,16,32}_rep calls instead. This
is required as the dm9000 driver is in use by the blackfin
architecture which uses the asm-generic io accessors.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ben Herrenschmidt <benh@kernel.crashing.org>
Cc: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Matthew Leach <matthew@mattleach.net>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/davicom/dm9000.c')
-rw-r--r-- | drivers/net/ethernet/davicom/dm9000.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c index c716e95a61fe..c73472c369cd 100644 --- a/drivers/net/ethernet/davicom/dm9000.c +++ b/drivers/net/ethernet/davicom/dm9000.c | |||
@@ -193,35 +193,35 @@ iow(board_info_t * db, int reg, int value) | |||
193 | 193 | ||
194 | static void dm9000_outblk_8bit(void __iomem *reg, void *data, int count) | 194 | static void dm9000_outblk_8bit(void __iomem *reg, void *data, int count) |
195 | { | 195 | { |
196 | writesb(reg, data, count); | 196 | iowrite8_rep(reg, data, count); |
197 | } | 197 | } |
198 | 198 | ||
199 | static void dm9000_outblk_16bit(void __iomem *reg, void *data, int count) | 199 | static void dm9000_outblk_16bit(void __iomem *reg, void *data, int count) |
200 | { | 200 | { |
201 | writesw(reg, data, (count+1) >> 1); | 201 | iowrite16_rep(reg, data, (count+1) >> 1); |
202 | } | 202 | } |
203 | 203 | ||
204 | static void dm9000_outblk_32bit(void __iomem *reg, void *data, int count) | 204 | static void dm9000_outblk_32bit(void __iomem *reg, void *data, int count) |
205 | { | 205 | { |
206 | writesl(reg, data, (count+3) >> 2); | 206 | iowrite32_rep(reg, data, (count+3) >> 2); |
207 | } | 207 | } |
208 | 208 | ||
209 | /* input block from chip to memory */ | 209 | /* input block from chip to memory */ |
210 | 210 | ||
211 | static void dm9000_inblk_8bit(void __iomem *reg, void *data, int count) | 211 | static void dm9000_inblk_8bit(void __iomem *reg, void *data, int count) |
212 | { | 212 | { |
213 | readsb(reg, data, count); | 213 | ioread8_rep(reg, data, count); |
214 | } | 214 | } |
215 | 215 | ||
216 | 216 | ||
217 | static void dm9000_inblk_16bit(void __iomem *reg, void *data, int count) | 217 | static void dm9000_inblk_16bit(void __iomem *reg, void *data, int count) |
218 | { | 218 | { |
219 | readsw(reg, data, (count+1) >> 1); | 219 | ioread16_rep(reg, data, (count+1) >> 1); |
220 | } | 220 | } |
221 | 221 | ||
222 | static void dm9000_inblk_32bit(void __iomem *reg, void *data, int count) | 222 | static void dm9000_inblk_32bit(void __iomem *reg, void *data, int count) |
223 | { | 223 | { |
224 | readsl(reg, data, (count+3) >> 2); | 224 | ioread32_rep(reg, data, (count+3) >> 2); |
225 | } | 225 | } |
226 | 226 | ||
227 | /* dump block from chip to null */ | 227 | /* dump block from chip to null */ |