summaryrefslogtreecommitdiff
path: root/drivers/char/rio/typdef.h
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-03-24 11:18:26 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-24 15:33:29 (GMT)
commit27c6e526f34760a9c48a90112242b7165064fa85 (patch)
tree40505dbe2ab69e7f8077c7473984deecff0203f3 /drivers/char/rio/typdef.h
parentb6c6b6021ec735bd105e130ac1ee1606575f74c3 (diff)
downloadlinux-fsl-qoriq-27c6e526f34760a9c48a90112242b7165064fa85.tar.xz
[PATCH] rio driver rework continued #1
More header cleanups, strip out typedefs and remove cruft. There are a lot of magic macros that can go and also a great deal of abuse of volatile that is not needed any more as this patch set cleans up the misuse of pointer access to ISA and PCI space. It now builds cleanly on 64bit, although there is more work left to do Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/rio/typdef.h')
-rw-r--r--drivers/char/rio/typdef.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/char/rio/typdef.h b/drivers/char/rio/typdef.h
index 840c249..f40c1df 100644
--- a/drivers/char/rio/typdef.h
+++ b/drivers/char/rio/typdef.h
@@ -39,10 +39,10 @@
** These types are ONLY to be used for refering to data structures
** on the RIO Host card!
*/
-typedef volatile u8 BYTE;
-typedef volatile u16 WORD;
-typedef volatile u32 DWORD;
-typedef volatile u16 RIOP;
+typedef u8 BYTE;
+typedef u16 WORD;
+typedef u32 DWORD;
+typedef u16 RIOP;
/*
@@ -57,8 +57,7 @@ typedef unsigned short ushort_t;
typedef unsigned char uchar_t;
typedef unsigned char queue_t;
typedef unsigned char mblk_t;
-typedef unsigned int paddr_t;
-typedef unsigned char uchar;
+typedef unsigned long paddr_t;
#define TPNULL ((ushort)(0x8000))