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/riotable.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/riotable.c')
| -rw-r--r-- | drivers/char/rio/riotable.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c index d3abe0d37d64..364119e975b4 100644 --- a/drivers/char/rio/riotable.c +++ b/drivers/char/rio/riotable.c | |||
| @@ -534,8 +534,8 @@ int RIODeleteRta(struct rio_info *p, struct Map *MapP) | |||
| 534 | if (PortP->SecondBlock) { | 534 | if (PortP->SecondBlock) { |
| 535 | u16 dest_unit = HostMapP->ID; | 535 | u16 dest_unit = HostMapP->ID; |
| 536 | u16 dest_port = port - SysPort; | 536 | u16 dest_port = port - SysPort; |
| 537 | u16 *TxPktP; | 537 | u16 __iomem *TxPktP; |
| 538 | struct PKT *Pkt; | 538 | struct PKT __iomem *Pkt; |
| 539 | 539 | ||
| 540 | for (TxPktP = PortP->TxStart; TxPktP <= PortP->TxEnd; TxPktP++) { | 540 | for (TxPktP = PortP->TxStart; TxPktP <= PortP->TxEnd; TxPktP++) { |
| 541 | /* | 541 | /* |
| @@ -545,7 +545,7 @@ int RIODeleteRta(struct rio_info *p, struct Map *MapP) | |||
| 545 | ** a 32 bit pointer so it can be | 545 | ** a 32 bit pointer so it can be |
| 546 | ** accessed from the driver. | 546 | ** accessed from the driver. |
| 547 | */ | 547 | */ |
| 548 | Pkt = (struct PKT *) RIO_PTR(HostP->Caddr, readw(&*TxPktP)); | 548 | Pkt = (struct PKT __iomem *) RIO_PTR(HostP->Caddr, readw(&*TxPktP)); |
| 549 | rio_dprintk(RIO_DEBUG_TABLE, "Tx packet (%x) destination: Old %x:%x New %x:%x\n", *TxPktP, Pkt->dest_unit, Pkt->dest_port, dest_unit, dest_port); | 549 | rio_dprintk(RIO_DEBUG_TABLE, "Tx packet (%x) destination: Old %x:%x New %x:%x\n", *TxPktP, Pkt->dest_unit, Pkt->dest_port, dest_unit, dest_port); |
| 550 | writew(dest_unit, &Pkt->dest_unit); | 550 | writew(dest_unit, &Pkt->dest_unit); |
| 551 | writew(dest_port, &Pkt->dest_port); | 551 | writew(dest_port, &Pkt->dest_port); |
| @@ -781,13 +781,13 @@ int RIOReMapPorts(struct rio_info *p, struct Host *HostP, struct Map *HostMapP) | |||
| 781 | ** unless the host has been booted | 781 | ** unless the host has been booted |
| 782 | */ | 782 | */ |
| 783 | if ((HostP->Flags & RUN_STATE) == RC_RUNNING) { | 783 | if ((HostP->Flags & RUN_STATE) == RC_RUNNING) { |
| 784 | struct PHB *PhbP = PortP->PhbP = &HostP->PhbP[HostPort]; | 784 | struct PHB __iomem *PhbP = PortP->PhbP = &HostP->PhbP[HostPort]; |
| 785 | PortP->TxAdd = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_add)); | 785 | PortP->TxAdd = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_add)); |
| 786 | PortP->TxStart = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_start)); | 786 | PortP->TxStart = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_start)); |
| 787 | PortP->TxEnd = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_end)); | 787 | PortP->TxEnd = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_end)); |
| 788 | PortP->RxRemove = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_remove)); | 788 | PortP->RxRemove = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_remove)); |
| 789 | PortP->RxStart = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_start)); | 789 | PortP->RxStart = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_start)); |
| 790 | PortP->RxEnd = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_end)); | 790 | PortP->RxEnd = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_end)); |
| 791 | } else | 791 | } else |
| 792 | PortP->PhbP = NULL; | 792 | PortP->PhbP = NULL; |
| 793 | 793 | ||