Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 213835
b: refs/heads/master
c: 636b811
h: refs/heads/master
i:
  213833: 809c8a9
  213831: 661a6c5
v: v3
  • Loading branch information
Joe Perches authored and David S. Miller committed Aug 18, 2010
1 parent 1b91a25 commit 657d5a1
Show file tree
Hide file tree
Showing 10 changed files with 299 additions and 315 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 00093fab980d0a8950a64bdf9e346d0497b9a7e4
refs/heads/master: 636b8116d4e116eca1ac978f546b16fadfc15a6c
73 changes: 35 additions & 38 deletions trunk/drivers/net/pcmcia/3c574_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ earlier 3Com products.
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
Expand Down Expand Up @@ -373,8 +375,8 @@ static int tc574_config(struct pcmcia_device *link)
for (i = 0; i < 3; i++)
phys_addr[i] = htons(read_eeprom(ioaddr, i + 10));
if (phys_addr[0] == htons(0x6060)) {
printk(KERN_NOTICE "3c574_cs: IO port conflict at 0x%03lx"
"-0x%03lx\n", dev->base_addr, dev->base_addr+15);
pr_notice("IO port conflict at 0x%03lx-0x%03lx\n",
dev->base_addr, dev->base_addr+15);
goto failed;
}
}
Expand All @@ -388,7 +390,7 @@ static int tc574_config(struct pcmcia_device *link)
outw(2<<11, ioaddr + RunnerRdCtrl);
mcr = inb(ioaddr + 2);
outw(0<<11, ioaddr + RunnerRdCtrl);
printk(KERN_INFO " ASIC rev %d,", mcr>>3);
pr_info(" ASIC rev %d,", mcr>>3);
EL3WINDOW(3);
config = inl(ioaddr + Wn3_Config);
lp->default_media = (config & Xcvr) >> Xcvr_shift;
Expand Down Expand Up @@ -425,7 +427,7 @@ static int tc574_config(struct pcmcia_device *link)
}
}
if (phy > 32) {
printk(KERN_NOTICE " No MII transceivers found!\n");
pr_notice(" No MII transceivers found!\n");
goto failed;
}
i = mdio_read(ioaddr, lp->phys, 16) | 0x40;
Expand All @@ -441,18 +443,16 @@ static int tc574_config(struct pcmcia_device *link)
SET_NETDEV_DEV(dev, &link->dev);

if (register_netdev(dev) != 0) {
printk(KERN_NOTICE "3c574_cs: register_netdev() failed\n");
pr_notice("register_netdev() failed\n");
goto failed;
}

printk(KERN_INFO "%s: %s at io %#3lx, irq %d, "
"hw_addr %pM.\n",
dev->name, cardname, dev->base_addr, dev->irq,
dev->dev_addr);
printk(" %dK FIFO split %s Rx:Tx, %sMII interface.\n",
8 << config & Ram_size,
ram_split[(config & Ram_split) >> Ram_split_shift],
config & Autoselect ? "autoselect " : "");
netdev_info(dev, "%s at io %#3lx, irq %d, hw_addr %pM\n",
cardname, dev->base_addr, dev->irq, dev->dev_addr);
netdev_info(dev, " %dK FIFO split %s Rx:Tx, %sMII interface.\n",
8 << config & Ram_size,
ram_split[(config & Ram_split) >> Ram_split_shift],
config & Autoselect ? "autoselect " : "");

return 0;

Expand Down Expand Up @@ -499,14 +499,14 @@ static void dump_status(struct net_device *dev)
{
unsigned int ioaddr = dev->base_addr;
EL3WINDOW(1);
printk(KERN_INFO " irq status %04x, rx status %04x, tx status "
"%02x, tx free %04x\n", inw(ioaddr+EL3_STATUS),
inw(ioaddr+RxStatus), inb(ioaddr+TxStatus),
inw(ioaddr+TxFree));
netdev_info(dev, " irq status %04x, rx status %04x, tx status %02x, tx free %04x\n",
inw(ioaddr+EL3_STATUS),
inw(ioaddr+RxStatus), inb(ioaddr+TxStatus),
inw(ioaddr+TxFree));
EL3WINDOW(4);
printk(KERN_INFO " diagnostics: fifo %04x net %04x ethernet %04x"
" media %04x\n", inw(ioaddr+0x04), inw(ioaddr+0x06),
inw(ioaddr+0x08), inw(ioaddr+0x0a));
netdev_info(dev, " diagnostics: fifo %04x net %04x ethernet %04x media %04x\n",
inw(ioaddr+0x04), inw(ioaddr+0x06),
inw(ioaddr+0x08), inw(ioaddr+0x0a));
EL3WINDOW(1);
}

Expand All @@ -520,7 +520,7 @@ static void tc574_wait_for_completion(struct net_device *dev, int cmd)
while (--i > 0)
if (!(inw(dev->base_addr + EL3_STATUS) & 0x1000)) break;
if (i == 0)
printk(KERN_NOTICE "%s: command 0x%04x did not complete!\n", dev->name, cmd);
netdev_notice(dev, "command 0x%04x did not complete!\n", cmd);
}

/* Read a word from the EEPROM using the regular EEPROM access register.
Expand Down Expand Up @@ -722,7 +722,7 @@ static void el3_tx_timeout(struct net_device *dev)
{
unsigned int ioaddr = dev->base_addr;

printk(KERN_NOTICE "%s: Transmit timed out!\n", dev->name);
netdev_notice(dev, "Transmit timed out!\n");
dump_status(dev);
dev->stats.tx_errors++;
dev->trans_start = jiffies; /* prevent tx timeout */
Expand Down Expand Up @@ -845,8 +845,8 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)
EL3WINDOW(4);
fifo_diag = inw(ioaddr + Wn4_FIFODiag);
EL3WINDOW(1);
printk(KERN_NOTICE "%s: adapter failure, FIFO diagnostic"
" register %04x.\n", dev->name, fifo_diag);
netdev_notice(dev, "adapter failure, FIFO diagnostic register %04x\n",
fifo_diag);
if (fifo_diag & 0x0400) {
/* Tx overrun */
tc574_wait_for_completion(dev, TxReset);
Expand Down Expand Up @@ -900,7 +900,7 @@ static void media_check(unsigned long arg)
this, we can limp along even if the interrupt is blocked */
if ((inw(ioaddr + EL3_STATUS) & IntLatch) && (inb(ioaddr + Timer) == 0xff)) {
if (!lp->fast_poll)
printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name);
netdev_info(dev, "interrupt(s) dropped!\n");

local_irq_save(flags);
el3_interrupt(dev->irq, dev);
Expand All @@ -923,23 +923,21 @@ static void media_check(unsigned long arg)

if (media != lp->media_status) {
if ((media ^ lp->media_status) & 0x0004)
printk(KERN_INFO "%s: %s link beat\n", dev->name,
(lp->media_status & 0x0004) ? "lost" : "found");
netdev_info(dev, "%s link beat\n",
(lp->media_status & 0x0004) ? "lost" : "found");
if ((media ^ lp->media_status) & 0x0020) {
lp->partner = 0;
if (lp->media_status & 0x0020) {
printk(KERN_INFO "%s: autonegotiation restarted\n",
dev->name);
netdev_info(dev, "autonegotiation restarted\n");
} else if (partner) {
partner &= lp->advertising;
lp->partner = partner;
printk(KERN_INFO "%s: autonegotiation complete: "
"%sbaseT-%cD selected\n", dev->name,
((partner & 0x0180) ? "100" : "10"),
((partner & 0x0140) ? 'F' : 'H'));
netdev_info(dev, "autonegotiation complete: "
"%dbaseT-%cD selected\n",
(partner & 0x0180) ? 100 : 10,
(partner & 0x0140) ? 'F' : 'H');
} else {
printk(KERN_INFO "%s: link partner did not autonegotiate\n",
dev->name);
netdev_info(dev, "link partner did not autonegotiate\n");
}

EL3WINDOW(3);
Expand All @@ -949,10 +947,9 @@ static void media_check(unsigned long arg)

}
if (media & 0x0010)
printk(KERN_INFO "%s: remote fault detected\n",
dev->name);
netdev_info(dev, "remote fault detected\n");
if (media & 0x0002)
printk(KERN_INFO "%s: jabber detected\n", dev->name);
netdev_info(dev, "jabber detected\n");
lp->media_status = media;
}
spin_unlock_irqrestore(&lp->window_lock, flags);
Expand Down
13 changes: 7 additions & 6 deletions trunk/drivers/net/pcmcia/3c589_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
======================================================================*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define DRV_NAME "3c589_cs"
#define DRV_VERSION "1.162-ac"

Expand Down Expand Up @@ -273,8 +275,7 @@ static int tc589_config(struct pcmcia_device *link)
phys_addr = (__be16 *)dev->dev_addr;
/* Is this a 3c562? */
if (link->manf_id != MANFID_3COM)
printk(KERN_INFO "3c589_cs: hmmm, is this really a "
"3Com card??\n");
dev_info(&link->dev, "hmmm, is this really a 3Com card??\n");
multi = (link->card_id == PRODID_3COM_3C562);

link->io_lines = 16;
Expand Down Expand Up @@ -315,8 +316,8 @@ static int tc589_config(struct pcmcia_device *link)
for (i = 0; i < 3; i++)
phys_addr[i] = htons(read_eeprom(ioaddr, i));
if (phys_addr[0] == htons(0x6060)) {
printk(KERN_ERR "3c589_cs: IO port conflict at 0x%03lx"
"-0x%03lx\n", dev->base_addr, dev->base_addr+15);
dev_err(&link->dev, "IO port conflict at 0x%03lx-0x%03lx\n",
dev->base_addr, dev->base_addr+15);
goto failed;
}
}
Expand All @@ -330,12 +331,12 @@ static int tc589_config(struct pcmcia_device *link)
if ((if_port >= 0) && (if_port <= 3))
dev->if_port = if_port;
else
printk(KERN_ERR "3c589_cs: invalid if_port requested\n");
dev_err(&link->dev, "invalid if_port requested\n");

SET_NETDEV_DEV(dev, &link->dev);

if (register_netdev(dev) != 0) {
printk(KERN_ERR "3c589_cs: register_netdev() failed\n");
dev_err(&link->dev, "register_netdev() failed\n");
goto failed;
}

Expand Down
Loading

0 comments on commit 657d5a1

Please sign in to comment.