Skip to content

L
linux
Commit 8ff212f7 authored by Alexander Viro's avatar Alexander Viro Committed by Jeff Garzik
Browse files
Options

[PATCH] hd6457x iomem annotations 

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
parent 2a98eb89
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
drivers/net/wan/c101.c
View file @ 8ff212f7
......@@ -56,7 +56,7 @@ static char *hw; /* pointer to hw=xxx command line string */
typedef struct card_s {
struct net_device *dev;
spinlock_t lock; /* TX lock */
u8 *win0base; /* ISA window base address */
u8 __iomem *win0base; /* ISA window base address */
u32 phy_winbase; /* ISA physical base address */
sync_serial_settings settings;
int rxpart; /* partial frame received, next frame invalid*/
......
drivers/net/wan/hd6457x.c
View file @ 8ff212f7
......@@ -148,13 +148,13 @@ static inline u16 desc_offset(port_t *port, u16 desc, int transmit)
static inline pkt_desc* desc_address(port_t *port, u16 desc, int transmit)
static inline pkt_desc __iomem *desc_address(port_t *port, u16 desc, int transmit)
{
#ifdef PAGE0_ALWAYS_MAPPED
return (pkt_desc*)(win0base(port_to_card(port))
return (pkt_desc __iomem *)(win0base(port_to_card(port))
+ desc_offset(port, desc, transmit));
#else
return (pkt_desc*)(winbase(port_to_card(port))
return (pkt_desc __iomem *)(winbase(port_to_card(port))
+ desc_offset(port, desc, transmit));
#endif
}
......@@ -188,7 +188,7 @@ static void sca_init_sync_port(port_t *port)
: card->rx_ring_buffers;
for (i = 0; i < buffs; i++) {
pkt_desc* desc = desc_address(port, i, transmit);
pkt_desc __iomem *desc = desc_address(port, i, transmit);
u16 chain_off = desc_offset(port, i + 1, transmit);
u32 buff_off = buffer_offset(port, i, transmit);
......@@ -269,7 +269,7 @@ static inline void sca_msci_intr(port_t *port)
static inline void sca_rx(card_t *card, port_t *port, pkt_desc *desc, u16 rxin)
static inline void sca_rx(card_t *card, port_t *port, pkt_desc __iomem *desc, u16 rxin)
{
struct net_device *dev = port_to_dev(port);
struct net_device_stats *stats = hdlc_stats(dev);
......@@ -341,7 +341,7 @@ static inline void sca_rx_intr(port_t *port)
while (1) {
u32 desc_off = desc_offset(port, port->rxin, 0);
pkt_desc *desc;
pkt_desc __iomem *desc;
u32 cda = sca_ina(dmac + CDAL, card);
if ((cda >= desc_off) && (cda < desc_off + sizeof(pkt_desc)))
......@@ -392,7 +392,7 @@ static inline void sca_tx_intr(port_t *port)
DSR_TX(phy_node(port)), card);
while (1) {
pkt_desc *desc;
pkt_desc __iomem *desc;
u32 desc_off = desc_offset(port, port->txlast, 1);
u32 cda = sca_ina(dmac + CDAL, card);
......@@ -730,7 +730,7 @@ static int sca_xmit(struct sk_buff *skb, struct net_device *dev)
{
port_t *port = dev_to_port(dev);
card_t *card = port_to_card(port);
pkt_desc *desc;
pkt_desc __iomem *desc;
u32 buff, len;
#ifndef ALL_PAGES_ALWAYS_MAPPED
u8 page;
......@@ -799,7 +799,7 @@ static int sca_xmit(struct sk_buff *skb, struct net_device *dev)
#ifdef NEED_DETECT_RAM
static u32 __devinit sca_detect_ram(card_t *card, u8 *rambase, u32 ramsize)
static u32 __devinit sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize)
{
/* Round RAM size to 32 bits, fill from end to start */
u32 i = ramsize &= ~3;
......
drivers/net/wan/n2.c
View file @ 8ff212f7
......@@ -111,7 +111,7 @@ typedef struct port_s {
typedef struct card_s {
u8 *winbase; /* ISA window base address */
u8 __iomem *winbase; /* ISA window base address */
u32 phy_winbase; /* ISA physical base address */
u32 ram_size; /* number of bytes */
u16 io; /* IO Base address */
......
drivers/net/wan/pc300_tty.c
View file @ 8ff212f7
......@@ -730,13 +730,13 @@ static void cpc_tty_rx_work(void * data)
*/
static void cpc_tty_rx_disc_frame(pc300ch_t *pc300chan)
{
volatile pcsca_bd_t * ptdescr;
volatile pcsca_bd_t __iomem * ptdescr;
volatile unsigned char status;
pc300_t *card = (pc300_t *)pc300chan->card;
int ch = pc300chan->channel;
/* dma buf read */
ptdescr = (pcsca_bd_t *)(card->hw.rambase +
ptdescr = (pcsca_bd_t __iomem *)(card->hw.rambase +
RX_BD_ADDR(ch, pc300chan->rx_first_bd));
while (pc300chan->rx_first_bd != pc300chan->rx_last_bd) {
status = cpc_readb(&ptdescr->status);
......@@ -747,7 +747,7 @@ static void cpc_tty_rx_disc_frame(pc300ch_t *pc300chan)
if (status & DST_EOM) {
break; /* end of message */
}
ptdescr = (pcsca_bd_t *)(card->hw.rambase + cpc_readl(&ptdescr->next));
ptdescr = (pcsca_bd_t __iomem *)(card->hw.rambase + cpc_readl(&ptdescr->next));
}
}
......@@ -757,7 +757,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
pc300ch_t *pc300chan = (pc300ch_t *)pc300dev->chan;
pc300_t *card = (pc300_t *)pc300chan->card;
int ch = pc300chan->channel;
volatile pcsca_bd_t * ptdescr;
volatile pcsca_bd_t __iomem * ptdescr;
struct net_device_stats *stats = hdlc_stats(pc300dev->dev);
int rx_len, rx_aux;
volatile unsigned char status;
......@@ -775,14 +775,14 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
while (1) {
rx_len = 0;
ptdescr = (pcsca_bd_t *)(card->hw.rambase + RX_BD_ADDR(ch, first_bd));
ptdescr = (pcsca_bd_t __iomem *)(card->hw.rambase + RX_BD_ADDR(ch, first_bd));
while ((status = cpc_readb(&ptdescr->status)) & DST_OSB) {
rx_len += cpc_readw(&ptdescr->len);
first_bd = (first_bd + 1) & (N_DMA_RX_BUF - 1);
if (status & DST_EOM) {
break;
}
ptdescr=(pcsca_bd_t*)(card->hw.rambase+cpc_readl(&ptdescr->next));
ptdescr=(pcsca_bd_t __iomem *)(card->hw.rambase+cpc_readl(&ptdescr->next));
}
if (!rx_len) {
......@@ -814,7 +814,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
}
/* dma buf read */
ptdescr = (pcsca_bd_t *)(card->hw.rambase +
ptdescr = (pcsca_bd_t __iomem *)(card->hw.rambase +
RX_BD_ADDR(ch, pc300chan->rx_first_bd));
rx_len = 0; /* counter frame size */
......@@ -858,7 +858,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
/* read the segment of the frame */
if (rx_aux != 0) {
memcpy_fromio((new->data + rx_len),
(void *)(card->hw.rambase +
(void __iomem *)(card->hw.rambase +
cpc_readl(&ptdescr->ptbuf)), rx_aux);
rx_len += rx_aux;
}
......@@ -868,7 +868,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
(N_DMA_RX_BUF -1);
if (status & DST_EOM)break;
ptdescr = (pcsca_bd_t *) (card->hw.rambase +
ptdescr = (pcsca_bd_t __iomem *) (card->hw.rambase +
cpc_readl(&ptdescr->next));
}
/* update pointer */
......@@ -936,7 +936,7 @@ static int cpc_tty_send_to_card(pc300dev_t *dev,void* buf, int len)
int ch = chan->channel;
struct net_device_stats *stats = hdlc_stats(dev->dev);
unsigned long flags;
volatile pcsca_bd_t * ptdescr;
volatile pcsca_bd_t __iomem *ptdescr;
int i, nchar;
int tosend = len;
int nbuf = ((len - 1)/BD_DEF_LEN) + 1;
......@@ -953,11 +953,11 @@ static int cpc_tty_send_to_card(pc300dev_t *dev,void* buf, int len)
CPC_TTY_DBG("%s: call dma_buf_write\n",
(st_cpc_tty_area *)dev->cpc_tty->name);
for (i = 0 ; i < nbuf ; i++) {
ptdescr = (pcsca_bd_t *)(card->hw.rambase +
ptdescr = (pcsca_bd_t __iomem *)(card->hw.rambase +
TX_BD_ADDR(ch, card->chan[ch].tx_next_bd));
nchar = (BD_DEF_LEN > tosend) ? tosend : BD_DEF_LEN;
if (cpc_readb(&ptdescr->status) & DST_OSB) {
memcpy_toio((void *)(card->hw.rambase +
memcpy_toio((void __iomem *)(card->hw.rambase +
cpc_readl(&ptdescr->ptbuf)),
&pdata[len - tosend],
nchar);
......
drivers/net/wan/pci200syn.c
View file @ 8ff212f7
......@@ -90,9 +90,9 @@ typedef struct port_s {
typedef struct card_s {
u8* rambase; /* buffer memory base (virtual) */
u8* scabase; /* SCA memory base (virtual) */
plx9052* plxbase; /* PLX registers memory base (virtual) */
u8 __iomem *rambase; /* buffer memory base (virtual) */
u8 __iomem *scabase; /* SCA memory base (virtual) */
plx9052 __iomem *plxbase;/* PLX registers memory base (virtual) */
u16 rx_ring_buffers; /* number of buffers in a ring */
u16 tx_ring_buffers;
u16 buff_offset; /* offset of first buffer of first channel */
......@@ -116,7 +116,7 @@ typedef struct card_s {
#define get_port(card, port) (&card->ports[port])
#define sca_flush(card) (sca_in(IER0, card));
static inline void new_memcpy_toio(char *dest, char *src, int length)
static inline void new_memcpy_toio(char __iomem *dest, char *src, int length)
{
int len;
do {
......@@ -295,7 +295,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
{
card_t *card;
u8 rev_id;
u32 *p;
u32 __iomem *p;
int i;
u32 ramsize;
u32 ramphys; /* buffer memory base */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7