diff options
Diffstat (limited to 'drivers/net/smc911x.h')
-rw-r--r-- | drivers/net/smc911x.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index 0779a228d5a1..962a710459fc 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h | |||
@@ -73,13 +73,13 @@ | |||
73 | #if SMC_USE_PXA_DMA | 73 | #if SMC_USE_PXA_DMA |
74 | #define SMC_USE_DMA | 74 | #define SMC_USE_DMA |
75 | 75 | ||
76 | /* | 76 | /* |
77 | * Define the request and free functions | 77 | * Define the request and free functions |
78 | * These are unfortunately architecture specific as no generic allocation | 78 | * These are unfortunately architecture specific as no generic allocation |
79 | * mechanism exits | 79 | * mechanism exits |
80 | */ | 80 | */ |
81 | #define SMC_DMA_REQUEST(dev, handler) \ | 81 | #define SMC_DMA_REQUEST(dev, handler) \ |
82 | pxa_request_dma(dev->name, DMA_PRIO_LOW, handler, dev) | 82 | pxa_request_dma(dev->name, DMA_PRIO_LOW, handler, dev) |
83 | 83 | ||
84 | #define SMC_DMA_FREE(dev, dma) \ | 84 | #define SMC_DMA_FREE(dev, dma) \ |
85 | pxa_free_dma(dma) | 85 | pxa_free_dma(dma) |
@@ -101,14 +101,14 @@ | |||
101 | 101 | ||
102 | static dma_addr_t rx_dmabuf, tx_dmabuf; | 102 | static dma_addr_t rx_dmabuf, tx_dmabuf; |
103 | static int rx_dmalen, tx_dmalen; | 103 | static int rx_dmalen, tx_dmalen; |
104 | 104 | ||
105 | #ifdef SMC_insl | 105 | #ifdef SMC_insl |
106 | #undef SMC_insl | 106 | #undef SMC_insl |
107 | #define SMC_insl(a, r, p, l) \ | 107 | #define SMC_insl(a, r, p, l) \ |
108 | smc_pxa_dma_insl(lp->dev, a, lp->physaddr, r, lp->rxdma, p, l) | 108 | smc_pxa_dma_insl(lp->dev, a, lp->physaddr, r, lp->rxdma, p, l) |
109 | 109 | ||
110 | static inline void | 110 | static inline void |
111 | smc_pxa_dma_insl(struct device *dev, u_long ioaddr, u_long physaddr, | 111 | smc_pxa_dma_insl(struct device *dev, u_long ioaddr, u_long physaddr, |
112 | int reg, int dma, u_char *buf, int len) | 112 | int reg, int dma, u_char *buf, int len) |
113 | { | 113 | { |
114 | /* 64 bit alignment is required for memory to memory DMA */ | 114 | /* 64 bit alignment is required for memory to memory DMA */ |
@@ -136,7 +136,7 @@ smc_pxa_dma_insl(struct device *dev, u_long ioaddr, u_long physaddr, | |||
136 | smc_pxa_dma_insw(lp->dev, a, lp->physaddr, r, lp->rxdma, p, l) | 136 | smc_pxa_dma_insw(lp->dev, a, lp->physaddr, r, lp->rxdma, p, l) |
137 | 137 | ||
138 | static inline void | 138 | static inline void |
139 | smc_pxa_dma_insw(struct device *dev, u_long ioaddr, u_long physaddr, | 139 | smc_pxa_dma_insw(struct device *dev, u_long ioaddr, u_long physaddr, |
140 | int reg, int dma, u_char *buf, int len) | 140 | int reg, int dma, u_char *buf, int len) |
141 | { | 141 | { |
142 | /* 64 bit alignment is required for memory to memory DMA */ | 142 | /* 64 bit alignment is required for memory to memory DMA */ |
@@ -164,7 +164,7 @@ smc_pxa_dma_insw(struct device *dev, u_long ioaddr, u_long physaddr, | |||
164 | smc_pxa_dma_outsl(lp->dev, a, lp->physaddr, r, lp->txdma, p, l) | 164 | smc_pxa_dma_outsl(lp->dev, a, lp->physaddr, r, lp->txdma, p, l) |
165 | 165 | ||
166 | static inline void | 166 | static inline void |
167 | smc_pxa_dma_outsl(struct device *dev, u_long ioaddr, u_long physaddr, | 167 | smc_pxa_dma_outsl(struct device *dev, u_long ioaddr, u_long physaddr, |
168 | int reg, int dma, u_char *buf, int len) | 168 | int reg, int dma, u_char *buf, int len) |
169 | { | 169 | { |
170 | /* 64 bit alignment is required for memory to memory DMA */ | 170 | /* 64 bit alignment is required for memory to memory DMA */ |
@@ -192,7 +192,7 @@ smc_pxa_dma_outsl(struct device *dev, u_long ioaddr, u_long physaddr, | |||
192 | smc_pxa_dma_outsw(lp->dev, a, lp->physaddr, r, lp->txdma, p, l) | 192 | smc_pxa_dma_outsw(lp->dev, a, lp->physaddr, r, lp->txdma, p, l) |
193 | 193 | ||
194 | static inline void | 194 | static inline void |
195 | smc_pxa_dma_outsw(struct device *dev, u_long ioaddr, u_long physaddr, | 195 | smc_pxa_dma_outsw(struct device *dev, u_long ioaddr, u_long physaddr, |
196 | int reg, int dma, u_char *buf, int len) | 196 | int reg, int dma, u_char *buf, int len) |
197 | { | 197 | { |
198 | /* 64 bit alignment is required for memory to memory DMA */ | 198 | /* 64 bit alignment is required for memory to memory DMA */ |
@@ -607,7 +607,7 @@ struct chip_id { | |||
607 | u16 id; | 607 | u16 id; |
608 | char *name; | 608 | char *name; |
609 | }; | 609 | }; |
610 | 610 | ||
611 | static const struct chip_id chip_ids[] = { | 611 | static const struct chip_id chip_ids[] = { |
612 | { CHIP_9115, "LAN9115" }, | 612 | { CHIP_9115, "LAN9115" }, |
613 | { CHIP_9116, "LAN9116" }, | 613 | { CHIP_9116, "LAN9116" }, |