summaryrefslogtreecommitdiffstats
path: root/drivers/char/epca.h
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2005-09-15 22:53:28 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-16 10:38:10 -0700
commitbc9a5154a24d16d41cc79dbf1442de34454bc7db (patch)
treec9633ebe5ed8d20f7e2879e0acd1c991cc320de0 /drivers/char/epca.h
parent6da34a8dc03c9605b03154eacfd2234627cc485a (diff)
downloadop-kernel-dev-bc9a5154a24d16d41cc79dbf1442de34454bc7db.zip
op-kernel-dev-bc9a5154a24d16d41cc79dbf1442de34454bc7db.tar.gz
[PATCH] epca iomem annotations + several missing readw()
[originally sent to Alan, he had no problems with it] - iomem pointers marked as such - several direct dereferencings of such pointers replaced with read[bw](). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/epca.h')
-rw-r--r--drivers/char/epca.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/epca.h b/drivers/char/epca.h
index 20eeb5a..456d6c8 100644
--- a/drivers/char/epca.h
+++ b/drivers/char/epca.h
@@ -128,17 +128,17 @@ struct channel
unsigned long c_cflag;
unsigned long c_lflag;
unsigned long c_oflag;
- unsigned char *txptr;
- unsigned char *rxptr;
+ unsigned char __iomem *txptr;
+ unsigned char __iomem *rxptr;
unsigned char *tmp_buf;
struct board_info *board;
- struct board_chan *brdchan;
+ struct board_chan __iomem *brdchan;
struct digi_struct digiext;
struct tty_struct *tty;
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;
struct work_struct tqueue;
- struct global_data *mailbox;
+ struct global_data __iomem *mailbox;
};
struct board_info
@@ -149,8 +149,8 @@ struct board_info
unsigned short numports;
unsigned long port;
unsigned long membase;
- unsigned char __iomem *re_map_port;
- unsigned char *re_map_membase;
+ void __iomem *re_map_port;
+ void __iomem *re_map_membase;
unsigned long memory_seg;
void ( * memwinon ) (struct board_info *, unsigned int) ;
void ( * memwinoff ) (struct board_info *, unsigned int) ;
OpenPOWER on IntegriCloud