Commit 0c26cf9e authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] warning fixes

These are from inl going back to 32bit
parent 25409de1
...@@ -535,7 +535,7 @@ rio_tx_timeout (struct net_device *dev) ...@@ -535,7 +535,7 @@ rio_tx_timeout (struct net_device *dev)
{ {
long ioaddr = dev->base_addr; long ioaddr = dev->base_addr;
printk (KERN_INFO "%s: Tx timed out (%4.4lx), is buffer full?\n", printk (KERN_INFO "%s: Tx timed out (%4.4x), is buffer full?\n",
dev->name, readl (ioaddr + TxStatus)); dev->name, readl (ioaddr + TxStatus));
rio_free_tx(dev, 0); rio_free_tx(dev, 0);
dev->if_port = 0; dev->if_port = 0;
......
...@@ -1155,8 +1155,8 @@ static void netdev_timer(unsigned long data) ...@@ -1155,8 +1155,8 @@ static void netdev_timer(unsigned long data)
unsigned int old_linkok = np->linkok; unsigned int old_linkok = np->linkok;
if (debug) if (debug)
printk(KERN_DEBUG "%s: Media selection timer tick, status %8.8x " printk(KERN_DEBUG "%s: Media selection timer tick, status %8.8lx "
"config %8.8x.\n", dev->name, readl(ioaddr + ISR), "config %8.8lx.\n", dev->name, readl(ioaddr + ISR),
readl(ioaddr + TCRRCR)); readl(ioaddr + TCRRCR));
if (np->flags == HAS_MII_XCVR) { if (np->flags == HAS_MII_XCVR) {
...@@ -1184,7 +1184,7 @@ static void tx_timeout(struct net_device *dev) ...@@ -1184,7 +1184,7 @@ static void tx_timeout(struct net_device *dev)
long ioaddr = dev->base_addr; long ioaddr = dev->base_addr;
int i; int i;
printk(KERN_WARNING "%s: Transmit timed out, status %8.8x," printk(KERN_WARNING "%s: Transmit timed out, status %8.8lx,"
" resetting...\n", dev->name, readl(ioaddr + ISR)); " resetting...\n", dev->name, readl(ioaddr + ISR));
{ {
...@@ -1555,7 +1555,7 @@ static void intr_handler(int irq, void *dev_instance, struct pt_regs *rgs) ...@@ -1555,7 +1555,7 @@ static void intr_handler(int irq, void *dev_instance, struct pt_regs *rgs)
np->stats.rx_crc_errors += (readl(ioaddr + TALLY) & 0x7fff0000) >> 16; np->stats.rx_crc_errors += (readl(ioaddr + TALLY) & 0x7fff0000) >> 16;
if (debug) if (debug)
printk(KERN_DEBUG "%s: exiting interrupt, status=%#4.4x.\n", printk(KERN_DEBUG "%s: exiting interrupt, status=%#4.4lx.\n",
dev->name, readl(ioaddr + ISR)); dev->name, readl(ioaddr + ISR));
writel(np->imrvalue, ioaddr + IMR); writel(np->imrvalue, ioaddr + IMR);
......
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