Char: ip2, macros cleanup
- remove i2os.h -- there was only macro to macro renaming or useless stuff - remove another uselless stuf (NULLFUNC, NULLPTR, YES, NO) - use outb/inb directly - use locking functions directly - don't define another ROUNDUP, use roundup(x, 2) instead - some comments and whitespace cleanup - remove some commented crap - prepend the rest by I2 prefix to not collide with rest of the world like in following output (pointed out by akpm) In file included from drivers/char/ip2/ip2main.c:128: drivers/char/ip2/i2ellis.h:608:1: warning: "COMPLETE" redefined In file included from include/net/netns/ipv4.h:8, from include/net/net_namespace.h:13, from include/linux/seq_file.h:7, from include/asm/machdep.h:12, from include/asm/pci.h:17, from include/linux/pci.h:951, from drivers/char/ip2/ip2main.c:95: include/net/inet_frag.h:28:1: warning: this is the location of the previous definition Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
@@ -129,7 +129,6 @@ registers, use byte operations only.
|
||||
//------------------------------------------------
|
||||
//
|
||||
#include "ip2types.h"
|
||||
#include "i2os.h" /* For any o.s., compiler, or host-related issues */
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
// Manifests for the I/O map:
|
||||
@@ -644,5 +643,10 @@ typedef union _loadHdrStr
|
||||
#define ABS_BIGGEST_BOX 16 // Absolute the most ports per box
|
||||
#define ABS_MOST_PORTS (ABS_MAX_BOXES * ABS_BIGGEST_BOX)
|
||||
|
||||
#define I2_OUTSW(port, addr, count) outsw((port), (addr), (((count)+1)/2))
|
||||
#define I2_OUTSB(port, addr, count) outsb((port), (addr), (((count)+1))&-2)
|
||||
#define I2_INSW(port, addr, count) insw((port), (addr), (((count)+1)/2))
|
||||
#define I2_INSB(port, addr, count) insb((port), (addr), (((count)+1))&-2)
|
||||
|
||||
#endif // I2HW_H
|
||||
|
||||
|
Reference in New Issue
Block a user