diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-02-09 11:38:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 12:14:07 -0500 |
commit | 4ec031166f6a466a443f462e567f7551096b1741 (patch) | |
tree | 2f59cd620ddd83436a16c8e5a494d6147a398716 /include/asm-arm | |
parent | b81831c69afb82c0545d3de729290fab4e50d429 (diff) |
[PATCH] kill eth_io_copy_and_sum()
On all targets that sucker boils down to memcpy_fromio(sbk->data, from, len).
The function name is highly misguiding (it _never_ does any checksums), the
last argument is just a noise and simply expanding the call to memcpy_fromio()
gives shorter and more readable source. For a lot of reasons it has almost
no remaining users, so it's better to just outright kill it.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/arch-ixp4xx/io.h | 3 | ||||
-rw-r--r-- | include/asm-arm/io.h | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-arm/arch-ixp4xx/io.h b/include/asm-arm/arch-ixp4xx/io.h index 0d517267fb63..b7b5414d9320 100644 --- a/include/asm-arm/arch-ixp4xx/io.h +++ b/include/asm-arm/arch-ixp4xx/io.h | |||
@@ -238,9 +238,6 @@ __ixp4xx_readsl(const volatile void __iomem *bus_addr, u32 *vaddr, u32 count) | |||
238 | #define memcpy_fromio(a,c,l) _memcpy_fromio((a),(c),(l)) | 238 | #define memcpy_fromio(a,c,l) _memcpy_fromio((a),(c),(l)) |
239 | #define memcpy_toio(c,a,l) _memcpy_toio((c),(a),(l)) | 239 | #define memcpy_toio(c,a,l) _memcpy_toio((c),(a),(l)) |
240 | 240 | ||
241 | #define eth_io_copy_and_sum(s,c,l,b) \ | ||
242 | eth_copy_and_sum((s),__mem_pci(c),(l),(b)) | ||
243 | |||
244 | static inline int | 241 | static inline int |
245 | check_signature(const unsigned char __iomem *bus_addr, const unsigned char *signature, | 242 | check_signature(const unsigned char __iomem *bus_addr, const unsigned char *signature, |
246 | int length) | 243 | int length) |
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index 288f76b166d0..5f60b4220906 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h | |||
@@ -182,9 +182,6 @@ extern void _memset_io(volatile void __iomem *, int, size_t); | |||
182 | #define memcpy_fromio(a,c,l) _memcpy_fromio((a),__mem_pci(c),(l)) | 182 | #define memcpy_fromio(a,c,l) _memcpy_fromio((a),__mem_pci(c),(l)) |
183 | #define memcpy_toio(c,a,l) _memcpy_toio(__mem_pci(c),(a),(l)) | 183 | #define memcpy_toio(c,a,l) _memcpy_toio(__mem_pci(c),(a),(l)) |
184 | 184 | ||
185 | #define eth_io_copy_and_sum(s,c,l,b) \ | ||
186 | eth_copy_and_sum((s),__mem_pci(c),(l),(b)) | ||
187 | |||
188 | #elif !defined(readb) | 185 | #elif !defined(readb) |
189 | 186 | ||
190 | #define readb(c) (__readwrite_bug("readb"),0) | 187 | #define readb(c) (__readwrite_bug("readb"),0) |
@@ -194,8 +191,6 @@ extern void _memset_io(volatile void __iomem *, int, size_t); | |||
194 | #define writew(v,c) __readwrite_bug("writew") | 191 | #define writew(v,c) __readwrite_bug("writew") |
195 | #define writel(v,c) __readwrite_bug("writel") | 192 | #define writel(v,c) __readwrite_bug("writel") |
196 | 193 | ||
197 | #define eth_io_copy_and_sum(s,c,l,b) __readwrite_bug("eth_io_copy_and_sum") | ||
198 | |||
199 | #define check_signature(io,sig,len) (0) | 194 | #define check_signature(io,sig,len) (0) |
200 | 195 | ||
201 | #endif /* __mem_pci */ | 196 | #endif /* __mem_pci */ |