Skip to content

L
linux
Commit 985a63ed authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files
Options

tulip/21142.c: Use dev_<level> and pr_<level> 

Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d60bec4e
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 37 deletions
drivers/net/tulip/21142.c
View file @ 985a63ed
...@@ -43,8 +43,8 @@ void t21142_media_task(struct work_struct *work) ...@@ -43,8 +43,8 @@ void t21142_media_task(struct work_struct *work)
if ((csr14 & 0x80) && (csr12 & 0x7000) != 0x5000) if ((csr14 & 0x80) && (csr12 & 0x7000) != 0x5000)
csr12 |= 6; csr12 |= 6;
if (tulip_debug > 2) if (tulip_debug > 2)
printk(KERN_INFO"%s: 21143 negotiation status %8.8x, %s.\n", dev_info(&dev->dev, "21143 negotiation status %08x, %s\n",
dev->name, csr12, medianame[dev->if_port]); csr12, medianame[dev->if_port]);
if (tulip_media_cap[dev->if_port] & MediaIsMII) { if (tulip_media_cap[dev->if_port] & MediaIsMII) {
if (tulip_check_duplex(dev) < 0) { if (tulip_check_duplex(dev) < 0) {
netif_carrier_off(dev); netif_carrier_off(dev);
...@@ -56,23 +56,26 @@ void t21142_media_task(struct work_struct *work) ...@@ -56,23 +56,26 @@ void t21142_media_task(struct work_struct *work)
} else if (tp->nwayset) { } else if (tp->nwayset) {
/* Don't screw up a negotiated session! */ /* Don't screw up a negotiated session! */
if (tulip_debug > 1) if (tulip_debug > 1)
printk(KERN_INFO"%s: Using NWay-set %s media, csr12 %8.8x.\n", dev_info(&dev->dev,
dev->name, medianame[dev->if_port], csr12); "Using NWay-set %s media, csr12 %08x\n",
medianame[dev->if_port], csr12);
} else if (tp->medialock) { } else if (tp->medialock) {
; ;
} else if (dev->if_port == 3) { } else if (dev->if_port == 3) {
if (csr12 & 2) { /* No 100mbps link beat, revert to 10mbps. */ if (csr12 & 2) { /* No 100mbps link beat, revert to 10mbps. */
if (tulip_debug > 1) if (tulip_debug > 1)
printk(KERN_INFO"%s: No 21143 100baseTx link beat, %8.8x, " dev_info(&dev->dev,
"trying NWay.\n", dev->name, csr12); "No 21143 100baseTx link beat, %08x, trying NWay\n",
csr12);
t21142_start_nway(dev); t21142_start_nway(dev);
next_tick = 3*HZ; next_tick = 3*HZ;
} }
} else if ((csr12 & 0x7000) != 0x5000) { } else if ((csr12 & 0x7000) != 0x5000) {
/* Negotiation failed. Search media types. */ /* Negotiation failed. Search media types. */
if (tulip_debug > 1) if (tulip_debug > 1)
printk(KERN_INFO"%s: 21143 negotiation failed, status %8.8x.\n", dev_info(&dev->dev,
dev->name, csr12); "21143 negotiation failed, status %08x\n",
csr12);
if (!(csr12 & 4)) { /* 10mbps link beat good. */ if (!(csr12 & 4)) { /* 10mbps link beat good. */
new_csr6 = 0x82420000; new_csr6 = 0x82420000;
dev->if_port = 0; dev->if_port = 0;
...@@ -90,8 +93,8 @@ void t21142_media_task(struct work_struct *work) ...@@ -90,8 +93,8 @@ void t21142_media_task(struct work_struct *work)
iowrite32(1, ioaddr + CSR13); iowrite32(1, ioaddr + CSR13);
} }
if (tulip_debug > 1) if (tulip_debug > 1)
printk(KERN_INFO"%s: Testing new 21143 media %s.\n", dev_info(&dev->dev, "Testing new 21143 media %s\n",
dev->name, medianame[dev->if_port]); medianame[dev->if_port]);
if (new_csr6 != (tp->csr6 & ~0x00D5)) { if (new_csr6 != (tp->csr6 & ~0x00D5)) {
tp->csr6 &= 0x00D5; tp->csr6 &= 0x00D5;
tp->csr6 |= new_csr6; tp->csr6 |= new_csr6;
...@@ -119,8 +122,8 @@ void t21142_start_nway(struct net_device *dev) ...@@ -119,8 +122,8 @@ void t21142_start_nway(struct net_device *dev)
tp->nway = tp->mediasense = 1; tp->nway = tp->mediasense = 1;
tp->nwayset = tp->lpar = 0; tp->nwayset = tp->lpar = 0;
if (tulip_debug > 1) if (tulip_debug > 1)
printk(KERN_DEBUG "%s: Restarting 21143 autonegotiation, csr14=%8.8x.\n", printk(KERN_DEBUG "%s: Restarting 21143 autonegotiation, csr14=%08x\n",
dev->name, csr14); dev->name, csr14);
iowrite32(0x0001, ioaddr + CSR13); iowrite32(0x0001, ioaddr + CSR13);
udelay(100); udelay(100);
iowrite32(csr14, ioaddr + CSR14); iowrite32(csr14, ioaddr + CSR14);
...@@ -147,8 +150,9 @@ void t21142_lnk_change(struct net_device *dev, int csr5) ...@@ -147,8 +150,9 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
if ((csr14 & 0x80) && (csr12 & 0x7000) != 0x5000) if ((csr14 & 0x80) && (csr12 & 0x7000) != 0x5000)
csr12 |= 6; csr12 |= 6;
if (tulip_debug > 1) if (tulip_debug > 1)
printk(KERN_INFO"%s: 21143 link status interrupt %8.8x, CSR5 %x, " dev_info(&dev->dev,
"%8.8x.\n", dev->name, csr12, csr5, csr14); "21143 link status interrupt %08x, CSR5 %x, %08x\n",
csr12, csr5, csr14);
/* If NWay finished and we have a negotiated partner capability. */ /* If NWay finished and we have a negotiated partner capability. */
if (tp->nway && !tp->nwayset && (csr12 & 0x7000) == 0x5000) { if (tp->nway && !tp->nwayset && (csr12 & 0x7000) == 0x5000) {
...@@ -171,14 +175,15 @@ void t21142_lnk_change(struct net_device *dev, int csr5) ...@@ -171,14 +175,15 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
if (tulip_debug > 1) { if (tulip_debug > 1) {
if (tp->nwayset) if (tp->nwayset)
printk(KERN_INFO "%s: Switching to %s based on link " dev_info(&dev->dev,
"negotiation %4.4x & %4.4x = %4.4x.\n", "Switching to %s based on link negotiation %04x & %04x = %04x\n",
dev->name, medianame[dev->if_port], tp->sym_advertise, medianame[dev->if_port],
tp->lpar, negotiated); tp->sym_advertise, tp->lpar,
negotiated);
else else
printk(KERN_INFO "%s: Autonegotiation failed, using %s," dev_info(&dev->dev,
" link beat status %4.4x.\n", "Autonegotiation failed, using %s, link beat status %04x\n",
dev->name, medianame[dev->if_port], csr12); medianame[dev->if_port], csr12);
} }
if (tp->mtable) { if (tp->mtable) {
...@@ -201,14 +206,14 @@ void t21142_lnk_change(struct net_device *dev, int csr5) ...@@ -201,14 +206,14 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
#if 0 /* Restart shouldn't be needed. */ #if 0 /* Restart shouldn't be needed. */
iowrite32(tp->csr6 | RxOn, ioaddr + CSR6); iowrite32(tp->csr6 | RxOn, ioaddr + CSR6);
if (tulip_debug > 2) if (tulip_debug > 2)
printk(KERN_DEBUG "%s: Restarting Tx and Rx, CSR5 is %8.8x.\n", printk(KERN_DEBUG "%s: Restarting Tx and Rx, CSR5 is %08x\n",
dev->name, ioread32(ioaddr + CSR5)); dev->name, ioread32(ioaddr + CSR5));
#endif #endif
tulip_start_rxtx(tp); tulip_start_rxtx(tp);
if (tulip_debug > 2) if (tulip_debug > 2)
printk(KERN_DEBUG "%s: Setting CSR6 %8.8x/%x CSR12 %8.8x.\n", printk(KERN_DEBUG "%s: Setting CSR6 %08x/%x CSR12 %08x\n",
dev->name, tp->csr6, ioread32(ioaddr + CSR6), dev->name, tp->csr6, ioread32(ioaddr + CSR6),
ioread32(ioaddr + CSR12)); ioread32(ioaddr + CSR12));
} else if ((tp->nwayset && (csr5 & 0x08000000) && } else if ((tp->nwayset && (csr5 & 0x08000000) &&
(dev->if_port == 3 || dev->if_port == 5) && (dev->if_port == 3 || dev->if_port == 5) &&
(csr12 & 2) == 2) || (csr12 & 2) == 2) ||
...@@ -220,9 +225,9 @@ void t21142_lnk_change(struct net_device *dev, int csr5) ...@@ -220,9 +225,9 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
add_timer(&tp->timer); add_timer(&tp->timer);
} else if (dev->if_port == 3 || dev->if_port == 5) { } else if (dev->if_port == 3 || dev->if_port == 5) {
if (tulip_debug > 1) if (tulip_debug > 1)
printk(KERN_INFO"%s: 21143 %s link beat %s.\n", dev_info(&dev->dev, "21143 %s link beat %s\n",
dev->name, medianame[dev->if_port], medianame[dev->if_port],
(csr12 & 2) ? "failed" : "good"); (csr12 & 2) ? "failed" : "good");
if ((csr12 & 2) && ! tp->medialock) { if ((csr12 & 2) && ! tp->medialock) {
del_timer_sync(&tp->timer); del_timer_sync(&tp->timer);
t21142_start_nway(dev); t21142_start_nway(dev);
...@@ -232,21 +237,18 @@ void t21142_lnk_change(struct net_device *dev, int csr5) ...@@ -232,21 +237,18 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
iowrite32(csr14 & ~0x080, ioaddr + CSR14); iowrite32(csr14 & ~0x080, ioaddr + CSR14);
} else if (dev->if_port == 0 || dev->if_port == 4) { } else if (dev->if_port == 0 || dev->if_port == 4) {
if ((csr12 & 4) == 0) if ((csr12 & 4) == 0)
printk(KERN_INFO"%s: 21143 10baseT link beat good.\n", dev_info(&dev->dev, "21143 10baseT link beat good\n");
dev->name);
} else if (!(csr12 & 4)) { /* 10mbps link beat good. */ } else if (!(csr12 & 4)) { /* 10mbps link beat good. */
if (tulip_debug) if (tulip_debug)
printk(KERN_INFO"%s: 21143 10mbps sensed media.\n", dev_info(&dev->dev, "21143 10mbps sensed media\n");
dev->name);
dev->if_port = 0; dev->if_port = 0;
} else if (tp->nwayset) { } else if (tp->nwayset) {
if (tulip_debug) if (tulip_debug)
printk(KERN_INFO"%s: 21143 using NWay-set %s, csr6 %8.8x.\n", dev_info(&dev->dev, "21143 using NWay-set %s, csr6 %08x\n",
dev->name, medianame[dev->if_port], tp->csr6); medianame[dev->if_port], tp->csr6);
} else { /* 100mbps link beat good. */ } else { /* 100mbps link beat good. */
if (tulip_debug) if (tulip_debug)
printk(KERN_INFO"%s: 21143 100baseTx sensed media.\n", dev_info(&dev->dev, "21143 100baseTx sensed media\n");
dev->name);
dev->if_port = 3; dev->if_port = 3;
tp->csr6 = 0x838E0000 | (tp->csr6 & 0x20ff); tp->csr6 = 0x838E0000 | (tp->csr6 & 0x20ff);
iowrite32(0x0003FF7F, ioaddr + CSR14); iowrite32(0x0003FF7F, ioaddr + CSR14);
......
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