diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-05-27 00:08:25 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-05-27 02:26:14 -0400 |
commit | d886cb586f60a5ccf156392f96a39bc52db925d0 (patch) | |
tree | 5862de796cf8dfd2f38e30d36cc589a07b5f9d88 /drivers/char/rio/riointr.c | |
parent | a8bd60705aa17a998516837d9c1e503ad4cbd7fc (diff) |
[PATCH] trivial annotations in rio
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/char/rio/riointr.c')
-rw-r--r-- | drivers/char/rio/riointr.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c index 97f0fa550652..c05e84c6b0d3 100644 --- a/drivers/char/rio/riointr.c +++ b/drivers/char/rio/riointr.c | |||
@@ -102,7 +102,7 @@ void RIOTxEnable(char *en) | |||
102 | struct rio_info *p; | 102 | struct rio_info *p; |
103 | struct tty_struct *tty; | 103 | struct tty_struct *tty; |
104 | int c; | 104 | int c; |
105 | struct PKT *PacketP; | 105 | struct PKT __iomem *PacketP; |
106 | unsigned long flags; | 106 | unsigned long flags; |
107 | 107 | ||
108 | PortP = (struct Port *) en; | 108 | PortP = (struct Port *) en; |
@@ -144,7 +144,7 @@ void RIOTxEnable(char *en) | |||
144 | if (c == 0) | 144 | if (c == 0) |
145 | break; | 145 | break; |
146 | 146 | ||
147 | rio_memcpy_toio(PortP->HostP->Caddr, (caddr_t) PacketP->data, PortP->gs.xmit_buf + PortP->gs.xmit_tail, c); | 147 | rio_memcpy_toio(PortP->HostP->Caddr, PacketP->data, PortP->gs.xmit_buf + PortP->gs.xmit_tail, c); |
148 | /* udelay (1); */ | 148 | /* udelay (1); */ |
149 | 149 | ||
150 | writeb(c, &(PacketP->len)); | 150 | writeb(c, &(PacketP->len)); |
@@ -219,7 +219,7 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From) | |||
219 | for (port = p->RIOFirstPortsBooted; port < p->RIOLastPortsBooted + PORTS_PER_RTA; port++) { | 219 | for (port = p->RIOFirstPortsBooted; port < p->RIOLastPortsBooted + PORTS_PER_RTA; port++) { |
220 | struct Port *PortP = p->RIOPortp[port]; | 220 | struct Port *PortP = p->RIOPortp[port]; |
221 | struct tty_struct *ttyP; | 221 | struct tty_struct *ttyP; |
222 | struct PKT *PacketP; | 222 | struct PKT __iomem *PacketP; |
223 | 223 | ||
224 | /* | 224 | /* |
225 | ** not mapped in - most of the RIOPortp[] information | 225 | ** not mapped in - most of the RIOPortp[] information |
@@ -298,7 +298,7 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From) | |||
298 | for (port = p->RIOFirstPortsBooted; port < p->RIOLastPortsBooted + PORTS_PER_RTA; port++) { | 298 | for (port = p->RIOFirstPortsBooted; port < p->RIOLastPortsBooted + PORTS_PER_RTA; port++) { |
299 | struct Port *PortP = p->RIOPortp[port]; | 299 | struct Port *PortP = p->RIOPortp[port]; |
300 | struct tty_struct *ttyP; | 300 | struct tty_struct *ttyP; |
301 | struct PKT *PacketP; | 301 | struct PKT __iomem *PacketP; |
302 | 302 | ||
303 | /* | 303 | /* |
304 | ** not mapped in - most of the RIOPortp[] information | 304 | ** not mapped in - most of the RIOPortp[] information |
@@ -427,13 +427,13 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From) | |||
427 | 427 | ||
428 | while (PortP->WflushFlag && can_add_transmit(&PacketP, PortP) && (PortP->InUse == NOT_INUSE)) { | 428 | while (PortP->WflushFlag && can_add_transmit(&PacketP, PortP) && (PortP->InUse == NOT_INUSE)) { |
429 | int p; | 429 | int p; |
430 | struct PktCmd *PktCmdP; | 430 | struct PktCmd __iomem *PktCmdP; |
431 | 431 | ||
432 | rio_dprintk(RIO_DEBUG_INTR, "Add WFLUSH marker to data queue\n"); | 432 | rio_dprintk(RIO_DEBUG_INTR, "Add WFLUSH marker to data queue\n"); |
433 | /* | 433 | /* |
434 | ** make it look just like a WFLUSH command | 434 | ** make it look just like a WFLUSH command |
435 | */ | 435 | */ |
436 | PktCmdP = (struct PktCmd *) &PacketP->data[0]; | 436 | PktCmdP = (struct PktCmd __iomem *) &PacketP->data[0]; |
437 | 437 | ||
438 | writeb(WFLUSH, &PktCmdP->Command); | 438 | writeb(WFLUSH, &PktCmdP->Command); |
439 | 439 | ||
@@ -525,9 +525,9 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP) | |||
525 | { | 525 | { |
526 | struct tty_struct *TtyP; | 526 | struct tty_struct *TtyP; |
527 | unsigned short transCount; | 527 | unsigned short transCount; |
528 | struct PKT *PacketP; | 528 | struct PKT __iomem *PacketP; |
529 | register unsigned int DataCnt; | 529 | register unsigned int DataCnt; |
530 | unsigned char *ptr; | 530 | unsigned char __iomem *ptr; |
531 | unsigned char *buf; | 531 | unsigned char *buf; |
532 | int copied = 0; | 532 | int copied = 0; |
533 | 533 | ||
@@ -625,7 +625,7 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP) | |||
625 | ** to '#define', (this is the only place ___DEBUG_IT___ occurs in the | 625 | ** to '#define', (this is the only place ___DEBUG_IT___ occurs in the |
626 | ** driver). | 626 | ** driver). |
627 | */ | 627 | */ |
628 | ptr = (unsigned char *) PacketP->data + PortP->RxDataStart; | 628 | ptr = (unsigned char __iomem *) PacketP->data + PortP->RxDataStart; |
629 | 629 | ||
630 | tty_prepare_flip_string(TtyP, &buf, transCount); | 630 | tty_prepare_flip_string(TtyP, &buf, transCount); |
631 | rio_memcpy_fromio(buf, ptr, transCount); | 631 | rio_memcpy_fromio(buf, ptr, transCount); |