drivers/net/tulip: Cleanups
Subsystems (2)
cover drivers/net/tulip: Cleanups
checkpatch errors ignored
Joe Perches (13):
tulip_core: Use dev_<level> and pr_<level> tulip/21142.c: Use dev_<level> and pr_<level> tulip/de2104x.c: Use dev_<level> and pr_<level> tulip/dmfe.c: Use dev_<level> and pr_<level> tulip/eeprom.c: Use dev_<level> and pr_<level> tulip/interrupt.c: Use dev_<level> and pr_<level> tulip/media.c: Use dev_<level> and pr_<level> tulip/pnic.c: Use dev_<level> and pr_<level> tulip/pnic2.c: Use dev_<level> and pr_<level> tulip/timer.c: Use dev_<level> and pr_<level> tulip/uli526x.c: Use dev_<level> and pr_<level> tulip/winbond-840.c: Use dev_<level> and pr_<level> tulip/xircom_cb.c: Use dev_<level> and pr_<level>
drivers/net/tulip/21142.c | 76 +++++++++-------- drivers/net/tulip/de2104x.c | 138 +++++++++++++++--------------- drivers/net/tulip/dmfe.c | 67 +++++++-------- drivers/net/tulip/eeprom.c | 47 +++++----- drivers/net/tulip/interrupt.c | 100 ++++++++++++---------- drivers/net/tulip/media.c | 74 ++++++++-------- drivers/net/tulip/pnic.c | 33 ++++---- drivers/net/tulip/pnic2.c | 59 +++++++------- drivers/net/tulip/timer.c | 52 ++++++------ drivers/net/tulip/tulip_core.c | 162 ++++++++++++++++++------------------ drivers/net/tulip/uli526x.c | 46 ++++++---- drivers/net/tulip/winbond-840.c | 177 ++++++++++++++++++++------------------- drivers/net/tulip/xircom_cb.c | 44 ++++++---- 13 files changed, 547 insertions(+), 528 deletions(-)
PATCH 1/13 tulip_core: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where appropriate
Convert printks to pr_<level>
Change print formats with %d.dx to %0dx
Coalesce long formats
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/tulip/tulip_core.c | 162 ++++++++++++++++++++-------------------- 1 files changed, 82 insertions(+), 80 deletions(-)
drivers/net/tulip/tulip_core.c +82 -80
@@ -41,7 +41,6 @@static char version[]__devinitdata ="Linux Tulip driver version " DRV_VERSION " (" DRV_RELDATE ")\n" ; -/* A few user-configurable values. */ /* Maximum events (Rx packets, etc.) to handle at each interrupt. */
@@ -326,7 +325,8 @@ static void tulip_up(struct net_device *dev)udelay (100 );if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: tulip_up(), irq==%d.\n" , dev->name, dev->irq); +printk (KERN_DEBUG "%s: tulip_up(), irq==%d\n" , + dev->name, dev->irq);iowrite32 (tp->rx_ring_dma, ioaddr +CSR3 );iowrite32 (tp->tx_ring_dma, ioaddr +CSR4 );
@@ -387,8 +387,9 @@ static void tulip_up(struct net_device *dev) (dev->if_port ==12 ?0 : dev->if_port);for (i =0 ; i < tp->mtable->leafcount; i++)if (tp->mtable->mleaf[i].media == looking_for) { -printk (KERN_INFO "%s: Using user-specified media %s.\n" , - dev->name, medianame[dev->if_port]); +dev_info (&dev->dev, +"Using user-specified media %s\n" , + medianame[dev->if_port]); goto media_picked; } }
@@ -396,8 +397,9 @@ static void tulip_up(struct net_device *dev)int looking_for = tp->mtable->defaultmedia &MEDIA_MASK ;for (i =0 ; i < tp->mtable->leafcount; i++)if (tp->mtable->mleaf[i].media == looking_for) { -printk (KERN_INFO "%s: Using EEPROM-set media %s.\n" , - dev->name, medianame[looking_for]); +dev_info (&dev->dev, +"Using EEPROM-set media %s\n" , + medianame[looking_for]); goto media_picked; } }
@@ -424,9 +426,10 @@ media_picked:if (tp->mii_cnt) {tulip_select_media (dev,1 );if (tulip_debug >1 ) -printk (KERN_INFO "%s: Using MII transceiver %d, status " -"%4.4x.\n" , - dev->name, tp->phys[0 ],tulip_mdio_read (dev, tp->phys[0 ],1 )); +dev_info (&dev->dev, +"Using MII transceiver %d, status %04x\n" , + tp->phys[0 ], +tulip_mdio_read (dev, tp->phys[0 ],1 ));iowrite32 (csr6_mask_defstate, ioaddr +CSR6 ); tp->csr6 = csr6_mask_hdcap; dev->if_port =11 ;
@@ -490,9 +493,10 @@ media_picked:iowrite32 (0 , ioaddr +CSR2 );/* Rx poll demand */ if (tulip_debug >2 ) { -printk (KERN_DEBUG "%s: Done tulip_up(), CSR0 %8.8x, CSR5 %8.8x CSR6 %8.8x.\n" , - dev->name,ioread32 (ioaddr +CSR0 ),ioread32 (ioaddr +CSR5 ), -ioread32 (ioaddr +CSR6 )); +printk (KERN_DEBUG "%s: Done tulip_up(), CSR0 %08x, CSR5 %08x CSR6 %08x\n" , + dev->name,ioread32 (ioaddr +CSR0 ), +ioread32 (ioaddr +CSR5 ), +ioread32 (ioaddr +CSR6 )); }/* Set the timer to switch to check for link beat and perhaps switch
@@ -540,27 +544,30 @@ static void tulip_tx_timeout(struct net_device *dev)if (tulip_media_cap[dev->if_port] & MediaIsMII) {/* Do nothing -- the media monitor should handle this. */ if (tulip_debug >1 ) -printk (KERN_WARNING "%s: Transmit timeout using MII device.\n" , - dev->name); +dev_warn (&dev->dev, +"Transmit timeout using MII device\n" ); }else if (tp->chip_id ==DC21140 || tp->chip_id ==DC21142 || tp->chip_id ==MX98713 || tp->chip_id ==COMPEX9881 || tp->chip_id ==DM910X ) { -printk (KERN_WARNING "%s: 21140 transmit timed out, status %8.8x, " -"SIA %8.8x %8.8x %8.8x %8.8x, resetting...\n" , - dev->name,ioread32 (ioaddr +CSR5 ),ioread32 (ioaddr +CSR12 ), -ioread32 (ioaddr +CSR13 ),ioread32 (ioaddr +CSR14 ),ioread32 (ioaddr +CSR15 )); +dev_warn (&dev->dev, +"21140 transmit timed out, status %08x, SIA %08x %08x %08x %08x, resetting...\n" , +ioread32 (ioaddr +CSR5 ),ioread32 (ioaddr +CSR12 ), +ioread32 (ioaddr +CSR13 ),ioread32 (ioaddr +CSR14 ), +ioread32 (ioaddr +CSR15 )); tp->timeout_recovery =1 ;schedule_work (&tp->media_work); goto out_unlock; }else if (tp->chip_id ==PNIC2 ) { -printk (KERN_WARNING "%s: PNIC2 transmit timed out, status %8.8x, " -"CSR6/7 %8.8x / %8.8x CSR12 %8.8x, resetting...\n" , - dev->name, (int )ioread32 (ioaddr +CSR5 ), (int )ioread32 (ioaddr +CSR6 ), - (int )ioread32 (ioaddr +CSR7 ), (int )ioread32 (ioaddr +CSR12 )); +dev_warn (&dev->dev, +"PNIC2 transmit timed out, status %08x, CSR6/7 %08x / %08x CSR12 %08x, resetting...\n" , + (int )ioread32 (ioaddr +CSR5 ), + (int )ioread32 (ioaddr +CSR6 ), + (int )ioread32 (ioaddr +CSR7 ), + (int )ioread32 (ioaddr +CSR12 )); }else { -printk (KERN_WARNING "%s: Transmit timed out, status %8.8x, CSR12 " -"%8.8x, resetting...\n" , - dev->name,ioread32 (ioaddr +CSR5 ),ioread32 (ioaddr +CSR12 )); +dev_warn (&dev->dev, +"Transmit timed out, status %08x, CSR12 %08x, resetting...\n" , +ioread32 (ioaddr +CSR5 ),ioread32 (ioaddr +CSR12 )); dev->if_port =0 ; }
@@ -570,26 +577,26 @@ static void tulip_tx_timeout(struct net_device *dev)for (i =0 ; i <RX_RING_SIZE ; i++) {u8 *buf = (u8 *)(tp->rx_ring[i].buffer1);int j; -printk (KERN_DEBUG "%2d: %8.8x %8.8x %8.8x %8.8x " -"%2.2x %2.2x %2.2x.\n" , - i, (unsigned int )tp->rx_ring[i].status, - (unsigned int )tp->rx_ring[i].length, - (unsigned int )tp->rx_ring[i].buffer1, - (unsigned int )tp->rx_ring[i].buffer2, - buf[0 ], buf[1 ], buf[2 ]); +printk (KERN_DEBUG +"%2d: %08x %08x %08x %08x %02x %02x %02x\n" , + i, + (unsigned int )tp->rx_ring[i].status, + (unsigned int )tp->rx_ring[i].length, + (unsigned int )tp->rx_ring[i].buffer1, + (unsigned int )tp->rx_ring[i].buffer2, + buf[0 ], buf[1 ], buf[2 ]);for (j =0 ; buf[j] !=0xee && j <1600 ; j++)if (j <100 ) -printk (KERN_CONT " %2.2x" , buf[j]); -printk (KERN_CONT " j=%d.\n" , j); +pr_cont (" %02x" , buf[j]); +pr_cont (" j=%d\n" , j); } -printk (KERN_DEBUG " Rx ring %8.8x: " , (int )tp->rx_ring); +printk (KERN_DEBUG " Rx ring %08x: " , (int )tp->rx_ring);for (i =0 ; i <RX_RING_SIZE ; i++) -printk (KERN_CONT " %8.8x" , - (unsigned int )tp->rx_ring[i].status); -printk (KERN_DEBUG " Tx ring %8.8x: " , (int )tp->tx_ring); +pr_cont (" %08x" , (unsigned int )tp->rx_ring[i].status); +printk (KERN_DEBUG " Tx ring %08x: " , (int )tp->tx_ring);for (i =0 ; i <TX_RING_SIZE ; i++) -printk (KERN_CONT " %8.8x" , (unsigned int )tp->tx_ring[i].status); - printk(KERN_CONT "\n"); +pr_cont (" %08x" , (unsigned int )tp->tx_ring[i].status); + pr_cont("\n"); }#endif
@@ -832,8 +839,9 @@ static int tulip_close (struct net_device *dev)tulip_down (dev);if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Shutting down ethercard, status was %2.2x.\n" , - dev->name,ioread32 (ioaddr +CSR5 )); +dev_printk (KERN_DEBUG , &dev->dev, +"Shutting down ethercard, status was %02x\n" , +ioread32 (ioaddr +CSR5 ));free_irq (dev->irq, dev);
@@ -1073,10 +1081,10 @@ static void set_rx_mode(struct net_device *dev) filterbit &=0x3f ; mc_filter[filterbit >>5 ] |=1 << (filterbit &31 );if (tulip_debug >2 ) -printk (KERN_INFO "%s: Added filter for %pM" -" %8.8x bit %d.\n" , - dev->name, mclist->dmi_addr, -ether_crc (ETH_ALEN , mclist->dmi_addr), filterbit); +dev_info (&dev->dev, +"Added filter for %pM %08x bit %d\n" , + mclist->dmi_addr, +ether_crc (ETH_ALEN , mclist->dmi_addr), filterbit); }if (mc_filter[0 ] == tp->mc_filter[0 ] && mc_filter[1 ] == tp->mc_filter[1 ])
@@ -1288,9 +1296,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,unsigned int force_csr0 =0 ;#ifndef MODULE -static int did_version;/* Already printed version info. */ -if (tulip_debug >0 && did_version++ ==0 ) -printk (KERN_INFO "%s" , version); +if (tulip_debug >0 ) +printk_once (KERN_INFO "%s" , version);#endif board_idx++;
@@ -1301,7 +1308,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,*/ if (pdev->subsystem_vendor ==PCI_VENDOR_ID_LMC ) { - printk (KERN_ERR PFX "skipping LMC card.\n"); +pr_err (PFX "skipping LMC card\n" );return -ENODEV ; }
@@ -1317,15 +1324,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,if (pdev->vendor ==0x1282 && pdev->device ==0x9100 && pdev->revision <0x30 ) { - printk(KERN_INFO PFX - "skipping early DM9100 with Crc bug (use dmfe)\n"); +pr_info (PFX "skipping early DM9100 with Crc bug (use dmfe)\n" );return -ENODEV ; } dp =pci_device_to_OF_node (pdev);if (!(dp &&of_get_property (dp,"local-mac-address" ,NULL ))) { - printk(KERN_INFO PFX - "skipping DM910x expansion card (use dmfe)\n"); +pr_info (PFX "skipping DM910x expansion card (use dmfe)\n" );return -ENODEV ; } }
@@ -1372,9 +1377,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, i =pci_enable_device (pdev);if (i) { - printk (KERN_ERR PFX -"Cannot enable tulip board #%d, aborting\n" , - board_idx); +pr_err (PFX "Cannot enable tulip board #%d, aborting\n" , + board_idx);return i; }
@@ -1383,22 +1387,22 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,/* alloc_etherdev ensures aligned and zeroed private structures */ dev =alloc_etherdev (sizeof (*tp));if (!dev) { - printk (KERN_ERR PFX "ether device alloc failed, aborting\n"); +pr_err (PFX "ether device alloc failed, aborting\n" );return -ENOMEM ; }SET_NETDEV_DEV (dev, &pdev->dev);if (pci_resource_len (pdev,0 ) < tulip_tbl[chip_idx].io_size) { - printk (KERN_ERR PFX "%s: I/O region (0x%llx@0x%llx) too small, " -"aborting\n" ,pci_name (pdev), - (unsigned long long )pci_resource_len (pdev,0 ), - (unsigned long long)pci_resource_start (pdev, 0)); +pr_err (PFX "%s: I/O region (0x%llx@0x%llx) too small, aborting\n" , +pci_name (pdev), + (unsigned long long )pci_resource_len (pdev,0 ), + (unsigned long long )pci_resource_start (pdev,0 )); goto err_out_free_netdev; }/* grab all resources from both PIO and MMIO regions, as we * don't want anyone else messing around with our hardware */ -if (pci_request_regions (pdev,"tulip" )) +if (pci_request_regions (pdev,DRV_NAME )) goto err_out_free_netdev; ioaddr =pci_iomap (pdev,TULIP_BAR , tulip_tbl[chip_idx].io_size);
@@ -1611,8 +1615,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,if (dev->mem_start &MEDIA_MASK ) tp->default_port = dev->mem_start &MEDIA_MASK ;if (tp->default_port) { -printk (KERN_INFO "tulip%d: Transceiver selection forced to %s.\n" , - board_idx, medianame[tp->default_port &MEDIA_MASK ]); +pr_info (DRV_NAME "%d: Transceiver selection forced to %s\n" , + board_idx, medianame[tp->default_port &MEDIA_MASK ]); tp->medialock =1 ;if (tulip_media_cap[tp->default_port] & MediaAlwaysFD) tp->full_duplex =1 ;
@@ -1627,7 +1631,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, }if (tp->flags &HAS_MEDIA_TABLE ) { -sprintf (dev->name,"tulip%d" , board_idx);/* hack */ +sprintf (dev->name,DRV_NAME "%d" , board_idx);/* hack */ tulip_parse_eeprom (dev);strcpy (dev->name,"eth%d" );/* un-hack */ }
@@ -1663,20 +1667,18 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,if (register_netdev (dev)) goto err_out_free_ring; - printk(KERN_INFO "%s: %s rev %d at " +pci_set_drvdata (pdev, dev); + +dev_info (&dev->dev, #ifdef CONFIG_TULIP_MMIO - "MMIO" +"%s rev %d at MMIO %#llx,%s %pM, IRQ %d\n" , #else -"Port" +"%s rev %d at Port %#llx,%s %pM, IRQ %d\n" , #endif -" %#llx," , dev->name, chip_name, pdev->revision, - (unsigned long long )pci_resource_start (pdev,TULIP_BAR )); -pci_set_drvdata (pdev, dev); - -if (eeprom_missing) -printk (" EEPROM not present," ); -printk (" %pM" , dev->dev_addr); -printk (", IRQ %d.\n" , irq); + chip_name, pdev->revision, + (unsigned long long )pci_resource_start (pdev,TULIP_BAR ), + eeprom_missing ?" EEPROM not present," :"" , + dev->dev_addr, irq);if (tp->chip_id ==PNIC2 ) tp->link_change = pnic2_lnk_change;
@@ -1799,12 +1801,12 @@ static int tulip_resume(struct pci_dev *pdev)return 0 ;if ((retval =pci_enable_device (pdev))) { -printk (KERN_ERR "tulip: pci_enable_device failed in resume\n" ); +pr_err (PFX "pci_enable_device failed in resume\n" );return retval; }if ((retval =request_irq (dev->irq, tulip_interrupt,IRQF_SHARED , dev->name, dev))) { -printk (KERN_ERR "tulip: request_irq failed in resume\n" ); +pr_err (PFX "request_irq failed in resume\n" );return retval; }
@@ -1874,7 +1876,7 @@ static struct pci_driver tulip_driver = {static int __init tulip_init (void ) {#ifdef MODULE -printk (KERN_INFO "%s" , version); +pr_info ("%s" , version);#endif /* copy module parms into globals */
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 2/13 tulip/21142.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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 Joe Perches <[email protected]>
--- drivers/net/tulip/21142.c | 76 +++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 37 deletions(-)
drivers/net/tulip/21142.c +39 -37
@@ -43,8 +43,8 @@ void t21142_media_task(struct work_struct *work)if ((csr14 &0x80 ) && (csr12 &0x7000 ) !=0x5000 ) csr12 |=6 ;if (tulip_debug >2 ) -printk (KERN_INFO "%s: 21143 negotiation status %8.8x, %s.\n" , - dev->name, csr12, medianame[dev->if_port]); +dev_info (&dev->dev,"21143 negotiation status %08x, %s\n" , + csr12, medianame[dev->if_port]);if (tulip_media_cap[dev->if_port] & MediaIsMII) {if (tulip_check_duplex (dev) <0 ) {netif_carrier_off (dev);
@@ -56,23 +56,26 @@ void t21142_media_task(struct work_struct *work) }else if (tp->nwayset) {/* Don't screw up a negotiated session! */ if (tulip_debug >1 ) -printk (KERN_INFO "%s: Using NWay-set %s media, csr12 %8.8x.\n" , - dev->name, medianame[dev->if_port], csr12); +dev_info (&dev->dev, +"Using NWay-set %s media, csr12 %08x\n" , + medianame[dev->if_port], csr12); }else if (tp->medialock) { ; }else if (dev->if_port ==3 ) {if (csr12 &2 ) {/* No 100mbps link beat, revert to 10mbps. */ if (tulip_debug >1 ) -printk (KERN_INFO "%s: No 21143 100baseTx link beat, %8.8x, " -"trying NWay.\n" , dev->name, csr12); +dev_info (&dev->dev, +"No 21143 100baseTx link beat, %08x, trying NWay\n" , + csr12);t21142_start_nway (dev); next_tick =3 *HZ ; } }else if ((csr12 &0x7000 ) !=0x5000 ) {/* Negotiation failed. Search media types. */ if (tulip_debug >1 ) -printk (KERN_INFO "%s: 21143 negotiation failed, status %8.8x.\n" , - dev->name, csr12); +dev_info (&dev->dev, +"21143 negotiation failed, status %08x\n" , + csr12);if (!(csr12 &4 )) {/* 10mbps link beat good. */ new_csr6 =0x82420000 ; dev->if_port =0 ;
@@ -90,8 +93,8 @@ void t21142_media_task(struct work_struct *work)iowrite32 (1 , ioaddr +CSR13 ); }if (tulip_debug >1 ) -printk (KERN_INFO "%s: Testing new 21143 media %s.\n" , - dev->name, medianame[dev->if_port]); +dev_info (&dev->dev,"Testing new 21143 media %s\n" , + medianame[dev->if_port]);if (new_csr6 != (tp->csr6 & ~0x00D5 )) { tp->csr6 &=0x00D5 ; tp->csr6 |= new_csr6;
@@ -119,8 +122,8 @@ void t21142_start_nway(struct net_device *dev) tp->nway = tp->mediasense =1 ; tp->nwayset = tp->lpar =0 ;if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Restarting 21143 autonegotiation, csr14=%8.8x.\n" , - dev->name, csr14); +printk (KERN_DEBUG "%s: Restarting 21143 autonegotiation, csr14=%08x\n" , + dev->name, csr14);iowrite32 (0x0001 , ioaddr +CSR13 );udelay (100 );iowrite32 (csr14, ioaddr +CSR14 );
@@ -147,8 +150,9 @@ void t21142_lnk_change(struct net_device *dev, int csr5)if ((csr14 &0x80 ) && (csr12 &0x7000 ) !=0x5000 ) csr12 |=6 ;if (tulip_debug >1 ) -printk (KERN_INFO "%s: 21143 link status interrupt %8.8x, CSR5 %x, " -"%8.8x.\n" , dev->name, csr12, csr5, csr14); +dev_info (&dev->dev, +"21143 link status interrupt %08x, CSR5 %x, %08x\n" , + csr12, csr5, csr14);/* If NWay finished and we have a negotiated partner capability. */ if (tp->nway && !tp->nwayset && (csr12 &0x7000 ) ==0x5000 ) {
@@ -171,14 +175,15 @@ void t21142_lnk_change(struct net_device *dev, int csr5)if (tulip_debug >1 ) {if (tp->nwayset) -printk (KERN_INFO "%s: Switching to %s based on link " -"negotiation %4.4x & %4.4x = %4.4x.\n" , - dev->name, medianame[dev->if_port], tp->sym_advertise, - tp->lpar, negotiated); +dev_info (&dev->dev, +"Switching to %s based on link negotiation %04x & %04x = %04x\n" , + medianame[dev->if_port], + tp->sym_advertise, tp->lpar, + negotiated);else -printk (KERN_INFO "%s: Autonegotiation failed, using %s," -" link beat status %4.4x.\n" , - dev->name, medianame[dev->if_port], csr12); +dev_info (&dev->dev, +"Autonegotiation failed, using %s, link beat status %04x\n" , + medianame[dev->if_port], csr12); }if (tp->mtable) {
@@ -201,14 +206,14 @@ void t21142_lnk_change(struct net_device *dev, int csr5)#if 0 /* Restart shouldn't be needed. */ iowrite32 (tp->csr6 | RxOn, ioaddr +CSR6 );if (tulip_debug >2 ) -printk (KERN_DEBUG "%s: Restarting Tx and Rx, CSR5 is %8.8x.\n" , - dev->name,ioread32 (ioaddr +CSR5 )); +printk (KERN_DEBUG "%s: Restarting Tx and Rx, CSR5 is %08x\n" , + dev->name,ioread32 (ioaddr +CSR5 ));#endif tulip_start_rxtx (tp);if (tulip_debug >2 ) -printk (KERN_DEBUG "%s: Setting CSR6 %8.8x/%x CSR12 %8.8x.\n" , - dev->name, tp->csr6,ioread32 (ioaddr +CSR6 ), -ioread32 (ioaddr +CSR12 )); +printk (KERN_DEBUG "%s: Setting CSR6 %08x/%x CSR12 %08x\n" , + dev->name, tp->csr6,ioread32 (ioaddr +CSR6 ), +ioread32 (ioaddr +CSR12 )); } else if ((tp->nwayset && (csr5 & 0x08000000) && (dev->if_port == 3 || dev->if_port == 5) && (csr12 & 2) == 2) ||
@@ -220,9 +225,9 @@ void t21142_lnk_change(struct net_device *dev, int csr5)add_timer (&tp->timer); }else if (dev->if_port ==3 || dev->if_port ==5 ) {if (tulip_debug >1 ) -printk (KERN_INFO "%s: 21143 %s link beat %s.\n" , - dev->name, medianame[dev->if_port], - (csr12 &2 ) ?"failed" :"good" ); +dev_info (&dev->dev,"21143 %s link beat %s\n" , + medianame[dev->if_port], + (csr12 &2 ) ?"failed" :"good" );if ((csr12 &2 ) && ! tp->medialock) {del_timer_sync (&tp->timer);t21142_start_nway (dev);
@@ -232,21 +237,18 @@ void t21142_lnk_change(struct net_device *dev, int csr5)iowrite32 (csr14 & ~0x080 , ioaddr +CSR14 ); }else if (dev->if_port ==0 || dev->if_port ==4 ) {if ((csr12 &4 ) ==0 ) -printk (KERN_INFO "%s: 21143 10baseT link beat good.\n" , - dev->name); +dev_info (&dev->dev,"21143 10baseT link beat good\n" ); }else if (!(csr12 &4 )) {/* 10mbps link beat good. */ if (tulip_debug) -printk (KERN_INFO "%s: 21143 10mbps sensed media.\n" , - dev->name); +dev_info (&dev->dev,"21143 10mbps sensed media\n" ); dev->if_port =0 ; }else if (tp->nwayset) {if (tulip_debug) -printk (KERN_INFO "%s: 21143 using NWay-set %s, csr6 %8.8x.\n" , - dev->name, medianame[dev->if_port], tp->csr6); +dev_info (&dev->dev,"21143 using NWay-set %s, csr6 %08x\n" , + medianame[dev->if_port], tp->csr6); }else {/* 100mbps link beat good. */ if (tulip_debug) -printk (KERN_INFO "%s: 21143 100baseTx sensed media.\n" , - dev->name); +dev_info (&dev->dev,"21143 100baseTx sensed media\n" ); dev->if_port =3 ; tp->csr6 =0x838E0000 | (tp->csr6 &0x20ff );iowrite32 (0x0003FF7F , ioaddr +CSR14 );
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 3/13 tulip/de2104x.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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 Joe Perches <[email protected]>
--- drivers/net/tulip/de2104x.c | 138 +++++++++++++++++++++---------------------- 1 files changed, 68 insertions(+), 70 deletions(-)
drivers/net/tulip/de2104x.c +68 -70
@@ -382,9 +382,9 @@ static void de_rx_err_acct (struct de_private *de, unsigned rx_tail,/* Ingore earlier buffers. */ if ((status &0xffff ) !=0x7fff ) {if (netif_msg_rx_err (de)) -printk (KERN_WARNING "%s: Oversized Ethernet frame " -"spanned multiple buffers, status %8.8x!\n" , - de->dev->name, status); +dev_warn (&de->dev->dev, +"Oversized Ethernet frame spanned multiple buffers, status %08x!\n" , + status); de->net_stats.rx_length_errors++; } }else if (status & RxError) {
@@ -487,7 +487,7 @@ rx_next: }if (!rx_work) -printk (KERN_WARNING "%s: rx work limit reached\n" , de->dev->name); +dev_warn (&de->dev->dev,"rx work limit reached\n" ); de->rx_tail = rx_tail; }
@@ -504,7 +504,8 @@ static irqreturn_t de_interrupt (int irq, void *dev_instance)if (netif_msg_intr (de))printk (KERN_DEBUG "%s: intr, status %08x mode %08x desc %u/%u/%u\n" , - dev->name, status,dr32 (MacMode), de->rx_tail, de->tx_head, de->tx_tail); + dev->name, status,dr32 (MacMode), + de->rx_tail, de->tx_head, de->tx_tail);dw32 (MacStatus, status);
@@ -529,8 +530,9 @@ static irqreturn_t de_interrupt (int irq, void *dev_instance)pci_read_config_word (de->pdev,PCI_STATUS , &pci_status);pci_write_config_word (de->pdev,PCI_STATUS , pci_status); -printk (KERN_ERR "%s: PCI bus error, status=%08x, PCI status=%04x\n" , - dev->name, status, pci_status); +dev_err (&de->dev->dev, +"PCI bus error, status=%08x, PCI status=%04x\n" , + status, pci_status); }return IRQ_HANDLED ;
@@ -582,7 +584,8 @@ static void de_tx (struct de_private *de) de->net_stats.tx_packets++; de->net_stats.tx_bytes += skb->len;if (netif_msg_tx_done (de)) -printk (KERN_DEBUG "%s: tx done, slot %d\n" , de->dev->name, tx_tail); +printk (KERN_DEBUG "%s: tx done, slot %d\n" , + de->dev->name, tx_tail); }dev_kfree_skb_irq (skb); }
@@ -870,7 +873,7 @@ static void de_stop_rxtx (struct de_private *de)udelay (100 ); } -printk (KERN_WARNING "%s: timeout expired stopping DMA\n" , de->dev->name); +dev_warn (&de->dev->dev,"timeout expired stopping DMA\n" ); }static inline void de_start_rxtx (struct de_private *de)
@@ -905,8 +908,8 @@ static void de_link_up(struct de_private *de)if (!netif_carrier_ok (de->dev)) {netif_carrier_on (de->dev);if (netif_msg_link (de)) -printk (KERN_INFO "%s: link up, media %s\n" , - de->dev->name, media_name[de->media_type]); +dev_info (&de->dev->dev,"link up, media %s\n" , + media_name[de->media_type]); } }
@@ -915,7 +918,7 @@ static void de_link_down(struct de_private *de)if (netif_carrier_ok (de->dev)) {netif_carrier_off (de->dev);if (netif_msg_link (de)) -printk (KERN_INFO "%s: link down\n" , de->dev->name); +dev_info (&de->dev->dev,"link down\n" ); } }
@@ -925,7 +928,8 @@ static void de_set_media (struct de_private *de)u32 macmode =dr32 (MacMode);if (de_is_running (de)) -printk (KERN_WARNING "%s: chip is running while changing media!\n" , de->dev->name); +dev_warn (&de->dev->dev, +"chip is running while changing media!\n" );if (de->de21040)dw32 (CSR11 ,FULL_DUPLEX_MAGIC );
@@ -945,15 +949,15 @@ static void de_set_media (struct de_private *de) macmode &= ~FullDuplex;if (netif_msg_link (de)) { -printk (KERN_INFO -"%s: set link %s\n" -"%s: mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n" -"%s: set mode 0x%x, set sia 0x%x,0x%x,0x%x\n" , - de->dev->name, media_name[media], - de->dev->name,dr32 (MacMode),dr32 (SIAStatus), -dr32 (CSR13 ),dr32 (CSR14 ),dr32 (CSR15 ), - de->dev->name, macmode, de->media[media].csr13, - de->media[media].csr14, de->media[media].csr15); +dev_info (&de->dev->dev,"set link %s\n" , media_name[media]); +dev_info (&de->dev->dev,"mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n" , +dr32 (MacMode),dr32 (SIAStatus), +dr32 (CSR13 ),dr32 (CSR14 ),dr32 (CSR15 )); + +dev_info (&de->dev->dev, +"set mode 0x%x, set sia 0x%x,0x%x,0x%x\n" , + macmode, de->media[media].csr13, + de->media[media].csr14, de->media[media].csr15); }if (macmode !=dr32 (MacMode))dw32 (MacMode, macmode);
@@ -992,9 +996,8 @@ static void de21040_media_timer (unsigned long data)de_link_up (de); else if (netif_msg_timer(de)) - printk(KERN_INFO "%s: %s link ok, status %x\n", - dev->name, media_name[de->media_type], - status); + dev_info(&dev->dev, "%s link ok, status %x\n", + media_name[de->media_type], status);return ; }
@@ -1022,8 +1025,8 @@ no_link_yet:add_timer (&de->media_timer);if (netif_msg_timer (de)) -printk (KERN_INFO "%s: no link, trying media %s, status %x\n" , - dev->name, media_name[de->media_type], status); +dev_info (&dev->dev,"no link, trying media %s, status %x\n" , + media_name[de->media_type], status); }static unsigned int de_ok_to_advertise (struct de_private *de,u32 new_media)
@@ -1079,9 +1082,10 @@ static void de21041_media_timer (unsigned long data)de_link_up (de); else if (netif_msg_timer(de)) - printk(KERN_INFO "%s: %s link ok, mode %x status %x\n", - dev->name, media_name[de->media_type], - dr32(MacMode), status); + dev_info(&dev->dev, +"%s link ok, mode %x status %x\n" , + media_name[de->media_type], + dr32(MacMode), status);return ; }
@@ -1150,8 +1154,8 @@ no_link_yet:add_timer (&de->media_timer);if (netif_msg_timer (de)) -printk (KERN_INFO "%s: no link, trying media %s, status %x\n" , - dev->name, media_name[de->media_type], status); +dev_info (&dev->dev,"no link, trying media %s, status %x\n" , + media_name[de->media_type], status); }static void de_media_interrupt (struct de_private *de,u32 status)
@@ -1378,8 +1382,7 @@ static int de_open (struct net_device *dev) rc =de_alloc_rings (de);if (rc) { -printk (KERN_ERR "%s: ring allocation failure, err=%d\n" , - dev->name, rc); +dev_err (&dev->dev,"ring allocation failure, err=%d\n" , rc);return rc; }
@@ -1387,15 +1390,14 @@ static int de_open (struct net_device *dev) rc =request_irq (dev->irq, de_interrupt,IRQF_SHARED , dev->name, dev);if (rc) { -printk (KERN_ERR "%s: IRQ %d request failure, err=%d\n" , - dev->name, dev->irq, rc); +dev_err (&dev->dev,"IRQ %d request failure, err=%d\n" , + dev->irq, rc); goto err_out_free; } rc =de_init_hw (de);if (rc) { -printk (KERN_ERR "%s: h/w init failure, err=%d\n" , - dev->name, rc); +dev_err (&dev->dev,"h/w init failure, err=%d\n" , rc); goto err_out_free_irq; }
@@ -1666,8 +1668,8 @@ static int de_nway_reset(struct net_device *dev) status =dr32 (SIAStatus);dw32 (SIAStatus, (status & ~NWayState) | NWayRestart);if (netif_msg_link (de)) -printk (KERN_INFO "%s: link nway restart, status %x,%x\n" , - de->dev->name, status,dr32 (SIAStatus)); +dev_info (&de->dev->dev,"link nway restart, status %x,%x\n" , + status,dr32 (SIAStatus));return 0 ; }
@@ -1711,7 +1713,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de) de->dev->dev_addr[i] = value;udelay (1 );if (boguscnt <=0 ) - printk(KERN_WARNING PFX "timeout reading 21040 MAC address byte %u\n", i); +pr_warning (PFX "timeout reading 21040 MAC address byte %u\n" , i); } }
@@ -1830,9 +1832,8 @@ static void __devinit de21041_get_srom_info (struct de_private *de) }if (netif_msg_probe (de)) -printk (KERN_INFO "de%d: SROM leaf offset %u, default media %s\n" , - de->board_idx, ofs, - media_name[de->media_type]); +pr_info ("de%d: SROM leaf offset %u, default media %s\n" , + de->board_idx, ofs, media_name[de->media_type]);/* init SIA register values to defaults */ for (i =0 ; i <DE_MAX_MEDIA ; i++) {
@@ -1879,9 +1880,9 @@ static void __devinit de21041_get_srom_info (struct de_private *de) de->media[idx].type = idx;if (netif_msg_probe (de)) -printk (KERN_INFO "de%d: media block #%u: %s" , - de->board_idx, i, - media_name[de->media[idx].type]); +pr_info ("de%d: media block #%u: %s" , + de->board_idx, i, + media_name[de->media[idx].type]); bufp +=sizeof (ib->opts);
@@ -1893,13 +1894,13 @@ static void __devinit de21041_get_srom_info (struct de_private *de)sizeof (ib->csr15);if (netif_msg_probe (de)) -printk (" (%x,%x,%x)\n" , - de->media[idx].csr13, - de->media[idx].csr14, - de->media[idx].csr15); +pr_cont (" (%x,%x,%x)\n" , + de->media[idx].csr13, + de->media[idx].csr14, + de->media[idx].csr15); }else if (netif_msg_probe (de)) -printk ("\n" ); +pr_cont ("\n" );if (bufp > ((void *)&ee_data[DE_EEPROM_SIZE -3 ]))break ;
@@ -2005,7 +2006,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,/* check for invalid IRQ value */ if (pdev->irq <2 ) { rc = -EIO ; - printk(KERN_ERR PFX "invalid irq (%d) for pci dev %s\n", +pr_err (PFX "invalid irq (%d) for pci dev %s\n" , pdev->irq,pci_name (pdev)); goto err_out_res; }
@@ -2016,14 +2017,14 @@ static int __devinit de_init_one (struct pci_dev *pdev, pciaddr =pci_resource_start (pdev,1 );if (!pciaddr) { rc = -EIO ; - printk(KERN_ERR PFX "no MMIO resource for pci dev %s\n", - pci_name(pdev)); +pr_err (PFX "no MMIO resource for pci dev %s\n" ,pci_name (pdev)); goto err_out_res; }if (pci_resource_len (pdev,1 ) <DE_REGS_SIZE ) { rc = -EIO ; - printk(KERN_ERR PFX "MMIO resource (%llx) too small on pci dev %s\n", - (unsigned long long)pci_resource_len(pdev, 1), pci_name(pdev)); +pr_err (PFX "MMIO resource (%llx) too small on pci dev %s\n" , + (unsigned long long )pci_resource_len (pdev,1 ), +pci_name (pdev)); goto err_out_res; }
@@ -2031,9 +2032,9 @@ static int __devinit de_init_one (struct pci_dev *pdev, regs =ioremap_nocache (pciaddr,DE_REGS_SIZE );if (!regs) { rc = -EIO ; - printk(KERN_ERR PFX "Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n", - (unsigned long long )pci_resource_len (pdev,1 ), - pciaddr, pci_name(pdev)); +pr_err (PFX "Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n" , + (unsigned long long )pci_resource_len (pdev,1 ), + pciaddr,pci_name (pdev)); goto err_out_res; } dev->base_addr = (unsigned long ) regs;
@@ -2044,8 +2045,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,/* make sure hardware is not running */ rc =de_reset_mac (de);if (rc) { - printk(KERN_ERR PFX "Cannot reset MAC, pci dev %s\n", - pci_name(pdev)); +pr_err (PFX "Cannot reset MAC, pci dev %s\n" ,pci_name (pdev)); goto err_out_iomap; }
@@ -2065,12 +2065,11 @@ static int __devinit de_init_one (struct pci_dev *pdev, goto err_out_iomap;/* print info about board and interface just registered */ -printk (KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n" , - dev->name, - de->de21040 ?"21040" :"21041" , - dev->base_addr, - dev->dev_addr, - dev->irq); +dev_info (&dev->dev,"%s at 0x%lx, %pM, IRQ %d\n" , + de->de21040 ?"21040" :"21041" , + dev->base_addr, + dev->dev_addr, + dev->irq);pci_set_drvdata (pdev, dev);
@@ -2158,8 +2157,7 @@ static int de_resume (struct pci_dev *pdev)if (!netif_running (dev)) goto out_attach;if ((retval =pci_enable_device (pdev))) { -printk (KERN_ERR "%s: pci_enable_device failed in resume\n" , - dev->name); +dev_err (&dev->dev,"pci_enable_device failed in resume\n" ); goto out; }de_init_hw (de);
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 4/13 tulip/dmfe.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove 'DRV_NAME ": ' from logging messages Convert commented out printks to pr_debug
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/tulip/dmfe.c | 67 +++++++++++++++++++++------------------------ 1 files changed, 31 insertions(+), 36 deletions(-)
drivers/net/tulip/dmfe.c +31 -36
@@ -61,6 +61,8 @@Test and make sure PCI latency is now correct for all cases. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#define DRV_NAME "dmfe"#define DRV_VERSION "1.36.4"#define DRV_RELDATE "2002-01-17"
@@ -149,16 +151,17 @@#define DMFE_TX_TIMEOUT ((3*HZ)/2)/* tx packet time-out time 1.5 s" */ #define DMFE_TX_KICK (HZ/2)/* tx packet Kick-out time 0.5 s" */ -#define DMFE_DBUG (dbug_now, msg, value) \ - do { \ - if (dmfe_debug || (dbug_now)) \ - printk(KERN_ERR DRV_NAME ": %s %lx\n",\ - (msg), (long) (value)); \ +#define DMFE_DBUG (dbug_now, msg, value) \ + do { \ + if (dmfe_debug || (dbug_now)) \ + pr_err("%s %lx\n", \ + (msg), (long) (value)); \ } while (0) -#define SHOW_MEDIA_TYPE (mode) \ - printk (KERN_INFO DRV_NAME ": Change Speed to %sMhz %s duplex\n" , \ - (mode & 1) ? "100":"10", (mode & 4) ? "full":"half"); +#define SHOW_MEDIA_TYPE (mode) \ + pr_info("Change Speed to %sMhz %s duplex\n" , \ + (mode & 1) ? "100":"10", \ + (mode & 4) ? "full":"half");/* CR9 definition: SROM/MII */
@@ -391,8 +394,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,struct device_node *dp =pci_device_to_OF_node (pdev);if (dp &&of_get_property (dp,"local-mac-address" ,NULL )) { - printk(KERN_INFO DRV_NAME - ": skipping on-board DM910x (use tulip)\n"); +pr_info ("skipping on-board DM910x (use tulip)\n" );return -ENODEV ; } }
@@ -405,8 +407,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,SET_NETDEV_DEV (dev, &pdev->dev);if (pci_set_dma_mask (pdev,DMA_BIT_MASK (32 ))) { - printk(KERN_WARNING DRV_NAME - ": 32-bit PCI DMA not available.\n"); +pr_warning ("32-bit PCI DMA not available\n" ); err = -ENODEV ; goto err_out_free; }
@@ -417,13 +418,13 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev, goto err_out_free;if (!pci_resource_start (pdev,0 )) { - printk(KERN_ERR DRV_NAME ": I/O base is zero\n"); +pr_err ("I/O base is zero\n" ); err = -ENODEV ; goto err_out_disable; }if (pci_resource_len (pdev,0 ) < (CHK_IO_SIZE (pdev)) ) { - printk(KERN_ERR DRV_NAME ": Allocated I/O size too small\n"); +pr_err ("Allocated I/O size too small\n" ); err = -ENODEV ; goto err_out_disable; }
@@ -438,7 +439,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,#endif if (pci_request_regions (pdev,DRV_NAME )) { - printk(KERN_ERR DRV_NAME ": Failed to request PCI regions\n"); +pr_err ("Failed to request PCI regions\n" ); err = -ENODEV ; goto err_out_disable; }
@@ -497,12 +498,9 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,if (err) goto err_out_free_buf; -printk (KERN_INFO "%s: Davicom DM%04lx at pci%s, %pM, irq %d.\n" , - dev->name, - ent->driver_data >>16 , -pci_name (pdev), - dev->dev_addr, - dev->irq); +dev_info (&dev->dev,"Davicom DM%04lx at pci%s, %pM, irq %d\n" , + ent->driver_data >>16 , +pci_name (pdev), dev->dev_addr, dev->irq);pci_set_master (pdev);
@@ -696,7 +694,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,/* Too large packet check */ if (skb->len >MAX_PACKET_SIZE ) { - printk(KERN_ERR DRV_NAME ": big packet = %d\n", (u16)skb->len); +pr_err ("big packet = %d\n" , (u16 )skb->len);dev_kfree_skb (skb);return NETDEV_TX_OK ; }
@@ -706,8 +704,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,/* No Tx resource check, it never happen nromally */ if (db->tx_queue_cnt >=TX_FREE_DESC_CNT ) {spin_unlock_irqrestore (&db->lock, flags); - printk(KERN_ERR DRV_NAME ": No Tx resource %ld\n", - db->tx_queue_cnt); +pr_err ("No Tx resource %ld\n" , db->tx_queue_cnt);return NETDEV_TX_BUSY ; }
@@ -779,12 +776,11 @@ static int dmfe_stop(struct DEVICE *dev)#if 0 /* show statistic counter */ -printk (DRV_NAME ": FU:%lx EC:%lx LC:%lx NC:%lx" -" LOC:%lx TXJT:%lx RESET:%lx RCR8:%lx FAL:%lx TT:%lx\n" , - db->tx_fifo_underrun, db->tx_excessive_collision, - db->tx_late_collision, db->tx_no_carrier, db->tx_loss_carrier, - db->tx_jabber_timeout, db->reset_count, db->reset_cr8, - db->reset_fatal, db->reset_TXtimeout); +printk ("FU:%lx EC:%lx LC:%lx NC:%lx LOC:%lx TXJT:%lx RESET:%lx RCR8:%lx FAL:%lx TT:%lx\n" , + db->tx_fifo_underrun, db->tx_excessive_collision, + db->tx_late_collision, db->tx_no_carrier, db->tx_loss_carrier, + db->tx_jabber_timeout, db->reset_count, db->reset_cr8, + db->reset_fatal, db->reset_TXtimeout);#endif return 0 ;
@@ -885,7 +881,7 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db) txptr = db->tx_remove_ptr;while (db->tx_packet_cnt) { tdes0 =le32_to_cpu (txptr->tdes0); -/* printk(DRV_NAME ": tdes0=%x\n", tdes0); */ +pr_debug ("tdes0=%x\n" , tdes0);if (tdes0 &0x80000000 )break ;
@@ -895,7 +891,7 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db)/* Transmit statistic counter */ if ( tdes0 !=0x7fffffff ) { -/* printk(DRV_NAME ": tdes0=%x\n", tdes0); */ +pr_debug ("tdes0=%x\n" , tdes0); dev->stats.collisions += (tdes0 >>3 ) &0xf ; dev->stats.tx_bytes +=le32_to_cpu (txptr->tdes1) &0x7ff ;if (tdes0 &TDES0_ERR_MASK ) {
@@ -992,7 +988,7 @@ static void dmfe_rx_packet(struct DEVICE *dev, struct dmfe_board_info * db)/* error summary bit check */ if (rdes0 &0x8000 ) {/* This is a error packet */ -//printk(DRV_NAME ": rdes0: %lx\n", rdes0); +pr_debug ("rdes0: %x\n" , rdes0); dev->stats.rx_errors++;if (rdes0 &1 ) dev->stats.rx_fifo_errors++;
@@ -1191,8 +1187,7 @@ static void dmfe_timer(unsigned long data)if (time_after (jiffies, dev->trans_start +DMFE_TX_TIMEOUT ) ) { db->reset_TXtimeout++; db->wait_reset =1 ; -printk (KERN_WARNING "%s: Tx timeout - resetting\n" , - dev->name); +dev_warn (&dev->dev,"Tx timeout - resetting\n" ); } }
@@ -1646,7 +1641,7 @@ static u8 dmfe_sense_speed(struct dmfe_board_info * db)else /* DM9102/DM9102A */ phy_mode =phy_read (db->ioaddr, db->phy_addr,17 , db->chip_id) &0xf000 ; -/* printk(DRV_NAME ": Phy_mode %x ",phy_mode); */ +pr_debug ("Phy_mode %x\n" , phy_mode);switch (phy_mode) {case 0x1000 : db->op_mode =DMFE_10MHF ;break ;case 0x2000 : db->op_mode =DMFE_10MFD ;break ;
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 5/13 tulip/eeprom.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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 Joe Perches <[email protected]>
--- drivers/net/tulip/eeprom.c | 47 ++++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 23 deletions(-)
drivers/net/tulip/eeprom.c +24 -23
@@ -161,15 +161,15 @@ void __devinit tulip_parse_eeprom(struct net_device *dev)if (ee_data[0 ] ==0xff ) {if (last_mediatable) { controller_index++; -printk (KERN_INFO "%s: Controller %d of multiport board.\n" , - dev->name, controller_index); +dev_info (&dev->dev, +"Controller %d of multiport board\n" , + controller_index); tp->mtable = last_mediatable; ee_data = last_ee_data; goto subsequent_board; }else -printk (KERN_INFO "%s: Missing EEPROM, this interface may " -"not work correctly!\n" , - dev->name); +dev_info (&dev->dev, +"Missing EEPROM, this interface may not work correctly!\n" );return ; }/* Do a fix-up based on the vendor half of the station address prefix. */
@@ -181,16 +181,15 @@ void __devinit tulip_parse_eeprom(struct net_device *dev) i++;/* An Accton EN1207, not an outlaw Maxtech. */ memcpy (ee_data +26 , eeprom_fixups[i].newtable,sizeof (eeprom_fixups[i].newtable)); -printk (KERN_INFO "%s: Old format EEPROM on '%s' board. Using" -" substitute media control info.\n" , - dev->name, eeprom_fixups[i].name); +dev_info (&dev->dev, +"Old format EEPROM on '%s' board. Using substitute media control info\n" , + eeprom_fixups[i].name);break ; } }if (eeprom_fixups[i].name ==NULL ) {/* No fixup found. */ -printk (KERN_INFO "%s: Old style EEPROM with no media selection " -"information.\n" , - dev->name); +dev_info (&dev->dev, +"Old style EEPROM with no media selection information\n" );return ; } }
@@ -218,7 +217,8 @@ subsequent_board:/* there is no phy information, don't even try to build mtable */ if (count ==0 ) {if (tulip_debug >0 ) -printk (KERN_WARNING "%s: no phy info, aborting mtable build\n" , dev->name); +dev_warn (&dev->dev, +"no phy info, aborting mtable build\n" );return ; }
@@ -234,8 +234,8 @@ subsequent_board: mtable->has_nonmii = mtable->has_mii = mtable->has_reset =0 ; mtable->csr15dir = mtable->csr15val =0 ; -printk (KERN_INFO "%s: EEPROM default media type %s.\n" , dev->name, - media &0x0800 ?"Autosense" : medianame[media &MEDIA_MASK ]); +dev_info (&dev->dev,"EEPROM default media type %s\n" , + media &0x0800 ?"Autosense" : medianame[media &MEDIA_MASK ]);for (i =0 ; i < count; i++) {struct medialeaf *leaf = &mtable->mleaf[i];
@@ -298,16 +298,17 @@ subsequent_board: }if (tulip_debug >1 && leaf->media ==11 ) {unsigned char *bp = leaf->leafdata; -printk (KERN_INFO "%s: MII interface PHY %d, setup/reset " -"sequences %d/%d long, capabilities %2.2x %2.2x.\n" , - dev->name, bp[0 ], bp[1 ], bp[2 + bp[1 ]*2 ], - bp[5 + bp[2 + bp[1 ]*2 ]*2 ], bp[4 + bp[2 + bp[1 ]*2 ]*2 ]); +dev_info (&dev->dev, +"MII interface PHY %d, setup/reset sequences %d/%d long, capabilities %02x %02x\n" , + bp[0 ], bp[1 ], bp[2 + bp[1 ]*2 ], + bp[5 + bp[2 + bp[1 ]*2 ]*2 ], + bp[4 + bp[2 + bp[1 ]*2 ]*2 ]); } -printk (KERN_INFO "%s: Index #%d - Media %s (#%d) described " -"by a %s (%d) block.\n" , - dev->name, i, medianame[leaf->media &15 ], leaf->media, - leaf->type <ARRAY_SIZE (block_name) ? block_name[leaf->type] :"<unknown>" , - leaf->type); +dev_info (&dev->dev, +"Index #%d - Media %s (#%d) described by a %s (%d) block\n" , + i, medianame[leaf->media &15 ], leaf->media, + leaf->type <ARRAY_SIZE (block_name) ? block_name[leaf->type] :"<unknown>" , + leaf->type); }if (new_advertise) tp->sym_advertise = new_advertise;
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 6/13 tulip/interrupt.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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 Joe Perches <[email protected]>
--- drivers/net/tulip/interrupt.c | 100 ++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 47 deletions(-)
drivers/net/tulip/interrupt.c +53 -47
@@ -125,12 +125,12 @@ int tulip_poll(struct napi_struct *napi, int budget)#endif if (tulip_debug >4 ) -printk (KERN_DEBUG " In tulip_rx(), entry %d %8.8x.\n" , entry, - tp->rx_ring[entry].status); +printk (KERN_DEBUG " In tulip_rx(), entry %d %08x\n" , + entry, tp->rx_ring[entry].status); do { if (ioread32(tp->base_addr + CSR5) == 0xffffffff) { - printk(KERN_DEBUG " In tulip_poll(), hardware disappeared.\n"); + printk(KERN_DEBUG " In tulip_poll(), hardware disappeared\n"); break; } /* Acknowledge current RX interrupt sources. */
@@ -146,7 +146,7 @@ int tulip_poll(struct napi_struct *napi, int budget)break ;if (tulip_debug >5 ) -printk (KERN_DEBUG "%s: In tulip_rx(), entry %d %8.8x.\n" , +printk (KERN_DEBUG "%s: In tulip_rx(), entry %d %08x\n" , dev->name, entry, status);if (++work_done >= budget)
@@ -177,15 +177,15 @@ int tulip_poll(struct napi_struct *napi, int budget)/* Ingore earlier buffers. */ if ((status &0xffff ) !=0x7fff ) {if (tulip_debug >1 ) -printk (KERN_WARNING "%s: Oversized Ethernet frame " -"spanned multiple buffers, status %8.8x!\n" , - dev->name, status); +dev_warn (&dev->dev, +"Oversized Ethernet frame spanned multiple buffers, status %08x!\n" , + status); tp->stats.rx_length_errors++; } }else {/* There was a fatal error. */ if (tulip_debug >2 ) -printk (KERN_DEBUG "%s: Receive error, Rx status %8.8x.\n" , +printk (KERN_DEBUG "%s: Receive error, Rx status %08x\n" , dev->name, status); tp->stats.rx_errors++;/* end of a packet.*/ if (pkt_len > 1518 ||
@@ -226,12 +226,11 @@ int tulip_poll(struct napi_struct *napi, int budget)#ifndef final_versionif (tp->rx_buffers[entry].mapping !=le32_to_cpu (tp->rx_ring[entry].buffer1)) { -printk (KERN_ERR "%s: Internal fault: The skbuff addresses " -"do not match in tulip_rx: %08x vs. %08llx %p / %p.\n" , - dev->name, -le32_to_cpu (tp->rx_ring[entry].buffer1), - (unsigned long long )tp->rx_buffers[entry].mapping, - skb->head, temp); +dev_err (&dev->dev, +"Internal fault: The skbuff addresses do not match in tulip_rx: %08x vs. %08llx %p / %p\n" , +le32_to_cpu (tp->rx_ring[entry].buffer1), + (unsigned long long )tp->rx_buffers[entry].mapping, + skb->head, temp); }#endif
@@ -365,16 +364,16 @@ static int tulip_rx(struct net_device *dev)int received =0 ;if (tulip_debug >4 ) -printk (KERN_DEBUG " In tulip_rx(), entry %d %8.8x.\n" , entry, - tp->rx_ring[entry].status); +printk (KERN_DEBUG " In tulip_rx(), entry %d %08x\n" , + entry, tp->rx_ring[entry].status);/* If we own the next entry, it is a new packet. Send it up. */ while ( ! (tp->rx_ring[entry].status &cpu_to_le32 (DescOwned))) {s32 status =le32_to_cpu (tp->rx_ring[entry].status);short pkt_len;if (tulip_debug >5 ) -printk (KERN_DEBUG "%s: In tulip_rx(), entry %d %8.8x.\n" , - dev->name, entry, status); +printk (KERN_DEBUG "%s: In tulip_rx(), entry %d %08x\n" , + dev->name, entry, status);if (--rx_work_limit <0 )break ;
@@ -402,16 +401,16 @@ static int tulip_rx(struct net_device *dev)/* Ingore earlier buffers. */ if ((status &0xffff ) !=0x7fff ) {if (tulip_debug >1 ) -printk (KERN_WARNING "%s: Oversized Ethernet frame " -"spanned multiple buffers, status %8.8x!\n" , - dev->name, status); +dev_warn (&dev->dev, +"Oversized Ethernet frame spanned multiple buffers, status %08x!\n" , + status); tp->stats.rx_length_errors++; } }else {/* There was a fatal error. */ if (tulip_debug >2 ) -printk (KERN_DEBUG "%s: Receive error, Rx status %8.8x.\n" , - dev->name, status); +printk (KERN_DEBUG "%s: Receive error, Rx status %08x\n" , + dev->name, status); tp->stats.rx_errors++;/* end of a packet.*/ if (pkt_len >1518 || (status & RxDescRunt))
@@ -450,12 +449,11 @@ static int tulip_rx(struct net_device *dev)#ifndef final_versionif (tp->rx_buffers[entry].mapping !=le32_to_cpu (tp->rx_ring[entry].buffer1)) { -printk (KERN_ERR "%s: Internal fault: The skbuff addresses " -"do not match in tulip_rx: %08x vs. %Lx %p / %p.\n" , - dev->name, -le32_to_cpu (tp->rx_ring[entry].buffer1), - (long long )tp->rx_buffers[entry].mapping, - skb->head, temp); +dev_err (&dev->dev, +"Internal fault: The skbuff addresses do not match in tulip_rx: %08x vs. %Lx %p / %p\n" , +le32_to_cpu (tp->rx_ring[entry].buffer1), + (long long )tp->rx_buffers[entry].mapping, + skb->head, temp); }#endif
@@ -569,7 +567,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)#endif /* CONFIG_TULIP_NAPI */ if (tulip_debug >4 ) -printk (KERN_DEBUG "%s: interrupt csr5=%#8.8x new csr5=%#8.8x.\n" , +printk (KERN_DEBUG "%s: interrupt csr5=%#8.8x new csr5=%#8.8x\n" , dev->name, csr5,ioread32 (ioaddr +CSR5 ));
@@ -601,8 +599,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)/* There was an major error, log it. */ #ifndef final_versionif (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Transmit error, Tx status %8.8x.\n" , - dev->name, status); +printk (KERN_DEBUG "%s: Transmit error, Tx status %08x\n" , + dev->name, status);#endif tp->stats.tx_errors++;if (status &0x4104 ) tp->stats.tx_aborted_errors++;
@@ -631,8 +629,9 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)#ifndef final_versionif (tp->cur_tx - dirty_tx >TX_RING_SIZE ) { -printk (KERN_ERR "%s: Out-of-sync dirty pointer, %d vs. %d.\n" , - dev->name, dirty_tx, tp->cur_tx); +dev_err (&dev->dev, +"Out-of-sync dirty pointer, %d vs. %d\n" , + dirty_tx, tp->cur_tx); dirty_tx +=TX_RING_SIZE ; }#endif
@@ -643,9 +642,10 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance) tp->dirty_tx = dirty_tx;if (csr5 & TxDied) {if (tulip_debug >2 ) -printk (KERN_WARNING "%s: The transmitter stopped." -" CSR5 is %x, CSR6 %x, new CSR6 %x.\n" , - dev->name, csr5,ioread32 (ioaddr +CSR6 ), tp->csr6); +dev_warn (&dev->dev, +"The transmitter stopped. CSR5 is %x, CSR6 %x, new CSR6 %x\n" , + csr5,ioread32 (ioaddr +CSR6 ), + tp->csr6);tulip_restart_rxtx (tp); }spin_unlock (&tp->lock);
@@ -696,8 +696,9 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)* to the 21142/3 docs that is). * -- rmk */ -printk (KERN_ERR "%s: (%lu) System Error occurred (%d)\n" , - dev->name, tp->nir, error); +dev_err (&dev->dev, +"(%lu) System Error occurred (%d)\n" , + tp->nir, error); }/* Clear all error sources, included undocumented ones! */ iowrite32 (0x0800f7ba , ioaddr +CSR5 );
@@ -706,16 +707,17 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)if (csr5 & TimerInt) {if (tulip_debug >2 ) -printk (KERN_ERR "%s: Re-enabling interrupts, %8.8x.\n" , - dev->name, csr5); +dev_err (&dev->dev, +"Re-enabling interrupts, %08x\n" , + csr5);iowrite32 (tulip_tbl[tp->chip_id].valid_intrs, ioaddr +CSR7 ); tp->ttimer =0 ; oi++; }if (tx > maxtx || rx > maxrx || oi > maxoi) {if (tulip_debug >1 ) -printk (KERN_WARNING "%s: Too much work during an interrupt, " -"csr5=0x%8.8x. (%lu) (%d,%d,%d)\n" , dev->name, csr5, tp->nir, tx, rx, oi); +dev_warn (&dev->dev,"Too much work during an interrupt, csr5=0x%08x. (%lu) (%d,%d,%d)\n" , + csr5, tp->nir, tx, rx, oi);/* Acknowledge all interrupt sources. */ iowrite32 (0x8001ffff , ioaddr +CSR5 );
@@ -764,14 +766,18 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance) entry = tp->dirty_rx %RX_RING_SIZE ;if (tp->rx_buffers[entry].skb ==NULL ) {if (tulip_debug >1 ) -printk (KERN_WARNING "%s: in rx suspend mode: (%lu) (tp->cur_rx = %u, ttimer = %d, rx = %d) go/stay in suspend mode\n" , dev->name, tp->nir, tp->cur_rx, tp->ttimer, rx); +dev_warn (&dev->dev, +"in rx suspend mode: (%lu) (tp->cur_rx = %u, ttimer = %d, rx = %d) go/stay in suspend mode\n" , + tp->nir, tp->cur_rx, tp->ttimer, rx);if (tp->chip_id ==LC82C168 ) {iowrite32 (0x00 , ioaddr +CSR7 );mod_timer (&tp->timer,RUN_AT (HZ /50 )); }else {if (tp->ttimer ==0 || (ioread32 (ioaddr +CSR11 ) &0xffff ) ==0 ) {if (tulip_debug >1 ) -printk (KERN_WARNING "%s: in rx suspend mode: (%lu) set timer\n" , dev->name, tp->nir); +dev_warn (&dev->dev, +"in rx suspend mode: (%lu) set timer\n" , + tp->nir);iowrite32 (tulip_tbl[tp->chip_id].valid_intrs | TimerInt, ioaddr +CSR7 );iowrite32 (TimerInt, ioaddr +CSR5 );
@@ -787,8 +793,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance) }if (tulip_debug >4 ) -printk (KERN_DEBUG "%s: exiting interrupt, csr5=%#4.4x.\n" , - dev->name,ioread32 (ioaddr +CSR5 )); +printk (KERN_DEBUG "%s: exiting interrupt, csr5=%#04x\n" , + dev->name,ioread32 (ioaddr +CSR5 ));return IRQ_HANDLED ; }
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 7/13 tulip/media.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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 Joe Perches <[email protected]>
--- drivers/net/tulip/media.c | 74 ++++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 38 deletions(-)
drivers/net/tulip/media.c +36 -38
@@ -182,9 +182,8 @@ void tulip_select_media(struct net_device *dev, int startup)switch (mleaf->type) {case 0 :/* 21140 non-MII xcvr. */ if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Using a 21140 non-MII transceiver" -" with control setting %2.2x.\n" , - dev->name, p[1 ]); +printk (KERN_DEBUG "%s: Using a 21140 non-MII transceiver with control setting %02x\n" , + dev->name, p[1 ]); dev->if_port = p[0 ];if (startup)iowrite32 (mtable->csr12dir |0x100 , ioaddr +CSR12 );
@@ -205,15 +204,15 @@ void tulip_select_media(struct net_device *dev, int startup)struct medialeaf *rleaf = &mtable->mleaf[mtable->has_reset];unsigned char *rst = rleaf->leafdata;if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Resetting the transceiver.\n" , - dev->name); +printk (KERN_DEBUG "%s: Resetting the transceiver\n" , + dev->name);for (i =0 ; i < rst[0 ]; i++)iowrite32 (get_u16 (rst +1 + (i<<1 )) <<16 , ioaddr +CSR15 ); }if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: 21143 non-MII %s transceiver control " -"%4.4x/%4.4x.\n" , - dev->name, medianame[dev->if_port], setup[0 ], setup[1 ]); +printk (KERN_DEBUG "%s: 21143 non-MII %s transceiver control %04x/%04x\n" , + dev->name, medianame[dev->if_port], + setup[0 ], setup[1 ]);if (p[0 ] &0x40 ) {/* SIA (CSR13-15) setup values are provided. */ csr13val = setup[0 ]; csr14val = setup[1 ];
@@ -240,8 +239,8 @@ void tulip_select_media(struct net_device *dev, int startup)if (startup)iowrite32 (csr13val, ioaddr +CSR13 ); }if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Setting CSR15 to %8.8x/%8.8x.\n" , - dev->name, csr15dir, csr15val); +printk (KERN_DEBUG "%s: Setting CSR15 to %08x/%08x\n" , + dev->name, csr15dir, csr15val);if (mleaf->type ==4 ) new_csr6 =0x82020000 | ((setup[2 ] &0x71 ) <<18 );else
@@ -317,8 +316,9 @@ void tulip_select_media(struct net_device *dev, int startup)if (tp->mii_advertise ==0 ) tp->mii_advertise = tp->advertising[phy_num];if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Advertising %4.4x on MII %d.\n" , - dev->name, tp->mii_advertise, tp->phys[phy_num]); +printk (KERN_DEBUG "%s: Advertising %04x on MII %d\n" , + dev->name, tp->mii_advertise, + tp->phys[phy_num]);tulip_mdio_write (dev, tp->phys[phy_num],4 , tp->mii_advertise); }break ;
@@ -335,8 +335,8 @@ void tulip_select_media(struct net_device *dev, int startup)struct medialeaf *rleaf = &mtable->mleaf[mtable->has_reset];unsigned char *rst = rleaf->leafdata;if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Resetting the transceiver.\n" , - dev->name); +printk (KERN_DEBUG "%s: Resetting the transceiver\n" , + dev->name);for (i =0 ; i < rst[0 ]; i++)iowrite32 (get_u16 (rst +1 + (i<<1 )) <<16 , ioaddr +CSR15 ); }
@@ -344,20 +344,20 @@ void tulip_select_media(struct net_device *dev, int startup)break ; }default : -printk (KERN_DEBUG "%s: Invalid media table selection %d.\n" , - dev->name, mleaf->type); +printk (KERN_DEBUG "%s: Invalid media table selection %d\n" , + dev->name, mleaf->type); new_csr6 =0x020E0000 ; }if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Using media type %s, CSR12 is %2.2x.\n" , - dev->name, medianame[dev->if_port], +printk (KERN_DEBUG "%s: Using media type %s, CSR12 is %02x\n" , + dev->name, medianame[dev->if_port],ioread32 (ioaddr +CSR12 ) &0xff ); }else if (tp->chip_id ==LC82C168 ) {if (startup && ! tp->medialock) dev->if_port = tp->mii_cnt ?11 :0 ;if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: PNIC PHY status is %3.3x, media %s.\n" , - dev->name,ioread32 (ioaddr +0xB8 ), medianame[dev->if_port]); +printk (KERN_DEBUG "%s: PNIC PHY status is %3.3x, media %s\n" , + dev->name,ioread32 (ioaddr +0xB8 ), medianame[dev->if_port]);if (tp->mii_cnt) { new_csr6 =0x810C0000 ;iowrite32 (0x0001 , ioaddr +CSR15 );
@@ -388,10 +388,9 @@ void tulip_select_media(struct net_device *dev, int startup) }else new_csr6 =0x03860000 ;if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: No media description table, assuming " -"%s transceiver, CSR12 %2.2x.\n" , - dev->name, medianame[dev->if_port], -ioread32 (ioaddr +CSR12 )); +printk (KERN_DEBUG "%s: No media description table, assuming %s transceiver, CSR12 %02x\n" , + dev->name, medianame[dev->if_port], +ioread32 (ioaddr +CSR12 )); } tp->csr6 = new_csr6 | (tp->csr6 &0xfdff ) | (tp->full_duplex ?0x0200 :0 );
@@ -415,16 +414,17 @@ int tulip_check_duplex(struct net_device *dev) bmsr =tulip_mdio_read (dev, tp->phys[0 ],MII_BMSR ); lpa =tulip_mdio_read (dev, tp->phys[0 ],MII_LPA );if (tulip_debug >1 ) -printk (KERN_INFO "%s: MII status %4.4x, Link partner report " -"%4.4x.\n" , dev->name, bmsr, lpa); +dev_info (&dev->dev,"MII status %04x, Link partner report %04x\n" , + bmsr, lpa);if (bmsr ==0xffff )return -2 ;if ((bmsr &BMSR_LSTATUS ) ==0 ) {int new_bmsr =tulip_mdio_read (dev, tp->phys[0 ],MII_BMSR );if ((new_bmsr &BMSR_LSTATUS ) ==0 ) {if (tulip_debug >1 ) -printk (KERN_INFO "%s: No link beat on the MII interface," -" status %4.4x.\n" , dev->name, new_bmsr); +dev_info (&dev->dev, +"No link beat on the MII interface, status %04x\n" , + new_bmsr);return -1 ; } }
@@ -443,10 +443,10 @@ int tulip_check_duplex(struct net_device *dev)tulip_restart_rxtx (tp);if (tulip_debug >0 ) -printk (KERN_INFO "%s: Setting %s-duplex based on MII" -"#%d link partner capability of %4.4x.\n" , - dev->name, tp->full_duplex ?"full" :"half" , - tp->phys[0 ], lpa); +dev_info (&dev->dev, +"Setting %s-duplex based on MII#%d link partner capability of %04x\n" , + tp->full_duplex ?"full" :"half" , + tp->phys[0 ], lpa);return 1 ; }
@@ -501,15 +501,13 @@ void __devinit tulip_find_mii (struct net_device *dev, int board_idx) tp->phys[phy_idx++] = phy; -printk (KERN_INFO "tulip%d: MII transceiver #%d " -"config %4.4x status %4.4x advertising %4.4x.\n" , +pr_info ("tulip%d: MII transceiver #%d config %04x status %04x advertising %04x\n" , board_idx, phy, mii_reg0, mii_status, mii_advert);/* Fixup for DLink with miswired PHY. */ if (mii_advert != to_advert) { -printk (KERN_DEBUG "tulip%d: Advertising %4.4x on PHY %d," -" previously advertising %4.4x.\n" , - board_idx, to_advert, phy, mii_advert); +printk (KERN_DEBUG "tulip%d: Advertising %04x on PHY %d, previously advertising %04x\n" , + board_idx, to_advert, phy, mii_advert);tulip_mdio_write (dev, phy,4 , to_advert); }
@@ -554,7 +552,7 @@ void __devinit tulip_find_mii (struct net_device *dev, int board_idx) } tp->mii_cnt = phy_idx;if (tp->mtable && tp->mtable->has_mii && phy_idx ==0 ) { -printk (KERN_INFO "tulip%d: ***WARNING***: No MII transceiver found!\n" , +pr_info ("tulip%d: ***WARNING***: No MII transceiver found!\n" , board_idx); tp->phys[0 ] =1 ; }
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 8/13 tulip/pnic.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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 Joe Perches <[email protected]>
--- drivers/net/tulip/pnic.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-)
drivers/net/tulip/pnic.c +17 -16
@@ -40,8 +40,8 @@ void pnic_do_nway(struct net_device *dev) new_csr6 |=0x00000200 ; }if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: PNIC autonegotiated status %8.8x, %s.\n" , - dev->name, phy_reg, medianame[dev->if_port]); +printk (KERN_DEBUG "%s: PNIC autonegotiated status %08x, %s\n" , + dev->name, phy_reg, medianame[dev->if_port]);if (tp->csr6 != new_csr6) { tp->csr6 = new_csr6;/* Restart Tx */
@@ -58,8 +58,8 @@ void pnic_lnk_change(struct net_device *dev, int csr5)int phy_reg =ioread32 (ioaddr +0xB8 );if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: PNIC link changed state %8.8x, CSR5 %8.8x.\n" , - dev->name, phy_reg, csr5); +printk (KERN_DEBUG "%s: PNIC link changed state %08x, CSR5 %08x\n" , + dev->name, phy_reg, csr5);if (ioread32 (ioaddr +CSR5 ) & TPLnkFail) {iowrite32 ((ioread32 (ioaddr +CSR7 ) & ~TPLnkFail) | TPLnkPass, ioaddr +CSR7 );/* If we use an external MII, then we mustn't use the
@@ -114,9 +114,8 @@ void pnic_timer(unsigned long data)int csr5 =ioread32 (ioaddr +CSR5 );if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: PNIC timer PHY status %8.8x, %s " -"CSR5 %8.8x.\n" , - dev->name, phy_reg, medianame[dev->if_port], csr5); +printk (KERN_DEBUG "%s: PNIC timer PHY status %08x, %s CSR5 %08x\n" , + dev->name, phy_reg, medianame[dev->if_port], csr5);if (phy_reg &0x04000000 ) {/* Remote link fault */ iowrite32 (0x0201F078 , ioaddr +0xB8 ); next_tick =1 *HZ ;
@@ -126,10 +125,11 @@ void pnic_timer(unsigned long data) next_tick =60 *HZ ; }else if (csr5 & TPLnkFail) {/* 100baseTx link beat */ if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: %s link beat failed, CSR12 %4.4x, " -"CSR5 %8.8x, PHY %3.3x.\n" , - dev->name, medianame[dev->if_port], csr12, -ioread32 (ioaddr +CSR5 ),ioread32 (ioaddr +0xB8 )); +printk (KERN_DEBUG "%s: %s link beat failed, CSR12 %04x, CSR5 %08x, PHY %03x\n" , + dev->name, medianame[dev->if_port], + csr12, +ioread32 (ioaddr +CSR5 ), +ioread32 (ioaddr +0xB8 )); next_tick =3 *HZ ;if (tp->medialock) { }else if (tp->nwayset && (dev->if_port &1 )) {
@@ -151,10 +151,11 @@ void pnic_timer(unsigned long data)tulip_restart_rxtx (tp); dev->trans_start = jiffies;if (tulip_debug >1 ) -printk (KERN_INFO "%s: Changing PNIC configuration to %s " -"%s-duplex, CSR6 %8.8x.\n" , - dev->name, medianame[dev->if_port], - tp->full_duplex ?"full" :"half" , new_csr6); +dev_info (&dev->dev, +"Changing PNIC configuration to %s %s-duplex, CSR6 %08x\n" , + medianame[dev->if_port], + tp->full_duplex ?"full" :"half" , + new_csr6); } } }
@@ -162,7 +163,7 @@ too_good_connection:mod_timer (&tp->timer,RUN_AT (next_tick));if (!ioread32 (ioaddr +CSR7 )) {if (tulip_debug >1 ) -printk (KERN_INFO "%s: sw timer wakeup.\n" , dev->name); +dev_info (&dev->dev,"sw timer wakeup\n" );disable_irq (dev->irq);tulip_refill_rx (dev);enable_irq (dev->irq);
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 9/13 tulip/pnic2.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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 Joe Perches <[email protected]>
--- drivers/net/tulip/pnic2.c | 59 +++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 29 deletions(-)
drivers/net/tulip/pnic2.c +30 -29
@@ -87,8 +87,8 @@ void pnic2_timer(unsigned long data)int next_tick =60 *HZ ;if (tulip_debug >3 ) -printk (KERN_INFO "%s: PNIC2 negotiation status %8.8x.\n" , - dev->name,ioread32 (ioaddr +CSR12 )); +dev_info (&dev->dev,"PNIC2 negotiation status %08x\n" , +ioread32 (ioaddr +CSR12 ));if (next_tick) {mod_timer (&tp->timer,RUN_AT (next_tick));
@@ -125,8 +125,8 @@ void pnic2_start_nway(struct net_device *dev) csr14 |=0x00001184 ;if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Restarting PNIC2 autonegotiation, " -"csr14=%8.8x.\n" , dev->name, csr14); +printk (KERN_DEBUG "%s: Restarting PNIC2 autonegotiation, csr14=%08x\n" , + dev->name, csr14);/* tell pnic2_lnk_change we are doing an nway negotiation */ dev->if_port =0 ;
@@ -137,8 +137,8 @@ void pnic2_start_nway(struct net_device *dev) tp->csr6 =ioread32 (ioaddr +CSR6 );if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: On Entry to Nway, " -"csr6=%8.8x.\n" , dev->name, tp->csr6); +printk (KERN_DEBUG "%s: On Entry to Nway, csr6=%08x\n" , + dev->name, tp->csr6);/* mask off any bits not to touch * comment at top of file explains mask value
@@ -181,9 +181,9 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)int csr12 =ioread32 (ioaddr +CSR12 );if (tulip_debug >1 ) -printk (KERN_INFO "%s: PNIC2 link status interrupt %8.8x, " -" CSR5 %x, %8.8x.\n" , dev->name, csr12, - csr5,ioread32 (ioaddr +CSR14 )); +dev_info (&dev->dev, +"PNIC2 link status interrupt %08x, CSR5 %x, %08x\n" , + csr12, csr5,ioread32 (ioaddr +CSR14 ));/* If NWay finished and we have a negotiated partner capability. * check bits 14:12 for bit pattern 101 - all is good
@@ -215,9 +215,9 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)else if (negotiated &0x0020 ) dev->if_port =0 ;else {if (tulip_debug >1 ) -printk (KERN_INFO "%s: funny autonegotiate result " -"csr12 %8.8x advertising %4.4x\n" , - dev->name, csr12, tp->sym_advertise); +dev_info (&dev->dev, +"funny autonegotiate result csr12 %08x advertising %04x\n" , + csr12, tp->sym_advertise); tp->nwayset =0 ;/* so check if 100baseTx link state is okay */ if ((csr12 &2 ) ==0 && (tp->sym_advertise &0x0180 ))
@@ -231,10 +231,11 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)if (tulip_debug >1 ) {if (tp->nwayset) -printk (KERN_INFO "%s: Switching to %s based on link " -"negotiation %4.4x & %4.4x = %4.4x.\n" , - dev->name, medianame[dev->if_port], - tp->sym_advertise, tp->lpar, negotiated); +dev_info (&dev->dev, +"Switching to %s based on link negotiation %04x & %04x = %04x\n" , + medianame[dev->if_port], + tp->sym_advertise, tp->lpar, + negotiated); }/* remember to turn off bit 7 - autonegotiate
@@ -270,9 +271,9 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)iowrite32 (1 , ioaddr +CSR13 );if (tulip_debug >2 ) -printk (KERN_DEBUG "%s: Setting CSR6 %8.8x/%x CSR12 " -"%8.8x.\n" , dev->name, tp->csr6, -ioread32 (ioaddr +CSR6 ),ioread32 (ioaddr +CSR12 )); +printk (KERN_DEBUG "%s: Setting CSR6 %08x/%x CSR12 %08x\n" , + dev->name, tp->csr6, +ioread32 (ioaddr +CSR6 ),ioread32 (ioaddr +CSR12 ));/* now the following actually writes out the * new csr6 values
@@ -282,9 +283,9 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)return ; }else { -printk (KERN_INFO "%s: Autonegotiation failed, " -"using %s, link beat status %4.4x.\n" , - dev->name, medianame[dev->if_port], csr12); +dev_info (&dev->dev, +"Autonegotiation failed, using %s, link beat status %04x\n" , + medianame[dev->if_port], csr12);/* remember to turn off bit 7 - autonegotiate * enable so we don't forget
@@ -339,9 +340,9 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)/* we are at 100mb and a potential link change occurred */ if (tulip_debug >1 ) -printk (KERN_INFO "%s: PNIC2 %s link beat %s.\n" , - dev->name, medianame[dev->if_port], - (csr12 &2 ) ?"failed" :"good" ); +dev_info (&dev->dev,"PNIC2 %s link beat %s\n" , + medianame[dev->if_port], + (csr12 &2 ) ?"failed" :"good" );/* check 100 link beat */
@@ -364,9 +365,9 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)/* we are at 10mb and a potential link change occurred */ if (tulip_debug >1 ) -printk (KERN_INFO "%s: PNIC2 %s link beat %s.\n" , - dev->name, medianame[dev->if_port], - (csr12 &4 ) ?"failed" :"good" ); +dev_info (&dev->dev,"PNIC2 %s link beat %s\n" , + medianame[dev->if_port], + (csr12 &4 ) ?"failed" :"good" ); tp->nway =0 ;
@@ -385,7 +386,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)if (tulip_debug >1 ) -printk (KERN_INFO "%s: PNIC2 Link Change Default?\n" ,dev->name); +dev_info (&dev->dev,"PNIC2 Link Change Default?\n" );/* if all else fails default to trying 10baseT-HD */ dev->if_port =0 ;
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 10/13 tulip/timer.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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 Joe Perches <[email protected]>
--- drivers/net/tulip/timer.c | 52 +++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 27 deletions(-)
drivers/net/tulip/timer.c +25 -27
@@ -28,11 +28,11 @@ void tulip_media_task(struct work_struct *work)unsigned long flags;if (tulip_debug >2 ) { -printk (KERN_DEBUG "%s: Media selection tick, %s, status %8.8x mode" -" %8.8x SIA %8.8x %8.8x %8.8x %8.8x.\n" , - dev->name, medianame[dev->if_port],ioread32 (ioaddr +CSR5 ), -ioread32 (ioaddr +CSR6 ), csr12,ioread32 (ioaddr +CSR13 ), -ioread32 (ioaddr +CSR14 ),ioread32 (ioaddr +CSR15 )); +printk (KERN_DEBUG "%s: Media selection tick, %s, status %08x mode %08x SIA %08x %08x %08x %08x\n" , + dev->name, medianame[dev->if_port], +ioread32 (ioaddr +CSR5 ),ioread32 (ioaddr +CSR6 ), + csr12,ioread32 (ioaddr +CSR13 ), +ioread32 (ioaddr +CSR14 ),ioread32 (ioaddr +CSR15 )); }switch (tp->chip_id) {case DC21140 :
@@ -48,9 +48,9 @@ void tulip_media_task(struct work_struct *work)Assume this a generic MII or SYM transceiver. */ next_tick =60 *HZ ;if (tulip_debug >2 ) -printk (KERN_DEBUG "%s: network media monitor CSR6 %8.8x " -"CSR12 0x%2.2x.\n" , - dev->name,ioread32 (ioaddr +CSR6 ), csr12 &0xff ); +printk (KERN_DEBUG "%s: network media monitor CSR6 %08x CSR12 0x%02x\n" , + dev->name, +ioread32 (ioaddr +CSR6 ), csr12 &0xff );break ; } mleaf = &tp->mtable->mleaf[tp->cur_index];
@@ -62,9 +62,8 @@ void tulip_media_task(struct work_struct *work)s8 bitnum = p[offset];if (p[offset+1 ] &0x80 ) {if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Transceiver monitor tick " -"CSR12=%#2.2x, no media sense.\n" , - dev->name, csr12); +printk (KERN_DEBUG "%s: Transceiver monitor tick CSR12=%#02x, no media sense\n" , + dev->name, csr12);if (mleaf->type ==4 ) {if (mleaf->media ==3 && (csr12 &0x02 )) goto select_next_media;
@@ -72,16 +71,16 @@ void tulip_media_task(struct work_struct *work)break ; }if (tulip_debug >2 ) -printk (KERN_DEBUG "%s: Transceiver monitor tick: CSR12=%#2.2x" -" bit %d is %d, expecting %d.\n" , - dev->name, csr12, (bitnum >>1 ) &7 , - (csr12 & (1 << ((bitnum >>1 ) &7 ))) !=0 , - (bitnum >=0 )); +printk (KERN_DEBUG "%s: Transceiver monitor tick: CSR12=%#02x bit %d is %d, expecting %d\n" , + dev->name, csr12, (bitnum >>1 ) &7 , + (csr12 & (1 << ((bitnum >>1 ) &7 ))) !=0 , + (bitnum >=0 ));/* Check that the specified bit has the proper value. */ if ((bitnum <0 ) != ((csr12 & (1 << ((bitnum >>1 ) &7 ))) !=0 )) {if (tulip_debug >2 ) -printk (KERN_DEBUG "%s: Link beat detected for %s.\n" , dev->name, +printk (KERN_DEBUG "%s: Link beat detected for %s\n" , + dev->name, medianame[mleaf->media &MEDIA_MASK ]);if ((p[2 ] &0x61 ) ==0x01 )/* Bogus Znyx board. */ goto actually_mii;
@@ -100,9 +99,9 @@ void tulip_media_task(struct work_struct *work)if (tulip_media_cap[dev->if_port] & MediaIsFD) goto select_next_media;/* Skip FD entries. */ if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: No link beat on media %s," -" trying transceiver type %s.\n" , - dev->name, medianame[mleaf->media &MEDIA_MASK ], +printk (KERN_DEBUG "%s: No link beat on media %s, trying transceiver type %s\n" , + dev->name, + medianame[mleaf->media &MEDIA_MASK ], medianame[tp->mtable->mleaf[tp->cur_index].media]);tulip_select_media (dev,0 );/* Restart the transmit process. */
@@ -151,8 +150,8 @@ void mxic_timer(unsigned long data)int next_tick =60 *HZ ;if (tulip_debug >3 ) { -printk (KERN_INFO "%s: MXIC negotiation status %8.8x.\n" , dev->name, -ioread32 (ioaddr +CSR12 )); +dev_info (&dev->dev,"MXIC negotiation status %08x\n" , +ioread32 (ioaddr +CSR12 )); }if (next_tick) {mod_timer (&tp->timer,RUN_AT (next_tick));
@@ -167,11 +166,10 @@ void comet_timer(unsigned long data)int next_tick =60 *HZ ;if (tulip_debug >1 ) -printk (KERN_DEBUG "%s: Comet link status %4.4x partner capability " -"%4.4x.\n" , - dev->name, -tulip_mdio_read (dev, tp->phys[0 ],1 ), -tulip_mdio_read (dev, tp->phys[0 ],5 )); +printk (KERN_DEBUG "%s: Comet link status %04x partner capability %04x\n" , + dev->name, +tulip_mdio_read (dev, tp->phys[0 ],1 ), +tulip_mdio_read (dev, tp->phys[0 ],5 ));/* mod_timer synchronizes us with potential add_timer calls * from interrupts. */
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 11/13 tulip/uli526x.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove DRV_NAME from logging messages
Add do {} while(0) to ULI526X_DBUG macro
Make SHOW_MEDIA_TYPE macro more readable
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/tulip/uli526x.c | 46 +++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 19 deletions(-)
drivers/net/tulip/uli526x.c +27 -19
@@ -12,6 +12,8 @@*/ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#define DRV_NAME "uli526x"#define DRV_VERSION "0.9.3"#define DRV_RELDATE "2005-7-29"
@@ -82,9 +84,16 @@#define ULI526X_TX_TIMEOUT ((16*HZ)/2)/* tx packet time-out time 8 s" */ #define ULI526X_TX_KICK (4*HZ/2)/* tx packet Kick-out time 2 s" */ -#define ULI526X_DBUG (dbug_now, msg, value) if (uli526x_debug || (dbug_now)) printk(KERN_ERR DRV_NAME ": %s %lx\n", (msg), (long) (value)) +#define ULI526X_DBUG (dbug_now, msg, value) \ +do { \ + if (uli526x_debug || (dbug_now)) \ + pr_err("%s %lx\n", (msg), (long) (value)); \ +} while (0) -#define SHOW_MEDIA_TYPE (mode) printk(KERN_ERR DRV_NAME ": Change Speed to %sMhz %s duplex\n",mode & 1 ?"100":"10", mode & 4 ? "full":"half"); +#define SHOW_MEDIA_TYPE (mode) \ + pr_err("Change Speed to %sMhz %s duplex\n", \ + mode & 1 ? "100" : "10", \ + mode & 4 ? "full" : "half");/* CR9 definition: SROM/MII */
@@ -284,7 +293,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,SET_NETDEV_DEV (dev, &pdev->dev);if (pci_set_dma_mask (pdev,DMA_BIT_MASK (32 ))) { - printk(KERN_WARNING DRV_NAME ": 32-bit PCI DMA not available.\n"); +pr_warning ("32-bit PCI DMA not available\n" ); err = -ENODEV ; goto err_out_free; }
@@ -295,19 +304,19 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev, goto err_out_free;if (!pci_resource_start (pdev,0 )) { - printk(KERN_ERR DRV_NAME ": I/O base is zero\n"); +pr_err ("I/O base is zero\n" ); err = -ENODEV ; goto err_out_disable; }if (pci_resource_len (pdev,0 ) < (ULI526X_IO_SIZE ) ) { - printk(KERN_ERR DRV_NAME ": Allocated I/O size too small\n"); +pr_err ("Allocated I/O size too small\n" ); err = -ENODEV ; goto err_out_disable; }if (pci_request_regions (pdev,DRV_NAME )) { - printk(KERN_ERR DRV_NAME ": Failed to request PCI regions\n"); +pr_err ("Failed to request PCI regions\n" ); err = -ENODEV ; goto err_out_disable; }
@@ -382,9 +391,9 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,if (err) goto err_out_res; -printk (KERN_INFO "%s: ULi M%04lx at pci%s, %pM, irq %d.\n" , - dev->name,ent->driver_data >>16 ,pci_name (pdev), - dev->dev_addr, dev->irq); +dev_info (&dev->dev,"ULi M%04lx at pci%s, %pM, irq %d\n" , + ent->driver_data >>16 ,pci_name (pdev), + dev->dev_addr, dev->irq);pci_set_master (pdev);
@@ -516,7 +525,7 @@ static void uli526x_init(struct net_device *dev) } }if (phy_tmp ==32 ) -printk (KERN_WARNING "Can not find the phy address!!!" ); +pr_warning ("Can not find the phy address!!!" );/* Parser SROM and media mode */ db->media_mode = uli526x_media_mode;
@@ -582,7 +591,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,/* Too large packet check */ if (skb->len >MAX_PACKET_SIZE ) { - printk(KERN_ERR DRV_NAME ": big packet = %d\n", (u16)skb->len); +pr_err ("big packet = %d\n" , (u16 )skb->len);dev_kfree_skb (skb);return NETDEV_TX_OK ; }
@@ -592,7 +601,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,/* No Tx resource check, it never happen nromally */ if (db->tx_packet_cnt >=TX_FREE_DESC_CNT ) {spin_unlock_irqrestore (&db->lock, flags); - printk(KERN_ERR DRV_NAME ": No Tx resource %ld\n", db->tx_packet_cnt); +pr_err ("No Tx resource %ld\n" , db->tx_packet_cnt);return NETDEV_TX_BUSY ; }
@@ -1058,7 +1067,7 @@ static void uli526x_timer(unsigned long data)/* Link Failed */ ULI526X_DBUG (0 ,"Link Failed" , tmp_cr12);netif_carrier_off (dev); -printk (KERN_INFO "uli526x: %s NIC Link is Down\n" ,dev->name); +pr_info ("%s NIC Link is Down\n" ,dev->name); db->link_failed =1 ;/* For Force 10/100M Half/Full mode: Enable Auto-Nego mode */
@@ -1090,11 +1099,11 @@ static void uli526x_timer(unsigned long data) }if (db->op_mode==ULI526X_10MFD || db->op_mode==ULI526X_100MFD ) { -printk (KERN_INFO "uli526x: %s NIC Link is Up %d Mbps Full duplex\n" ,dev->name,TmpSpeed); +pr_info ("%s NIC Link is Up %d Mbps Full duplex\n" ,dev->name,TmpSpeed); }else { -printk (KERN_INFO "uli526x: %s NIC Link is Up %d Mbps Half duplex\n" ,dev->name,TmpSpeed); +pr_info ("%s NIC Link is Up %d Mbps Half duplex\n" ,dev->name,TmpSpeed); }netif_carrier_on (dev); }
@@ -1104,7 +1113,7 @@ static void uli526x_timer(unsigned long data) {if (db->init==1 ) { -printk (KERN_INFO "uli526x: %s NIC Link is Down\n" ,dev->name); +pr_info ("%s NIC Link is Down\n" ,dev->name);netif_carrier_off (dev); } }
@@ -1230,8 +1239,7 @@ static int uli526x_resume(struct pci_dev *pdev) err =pci_set_power_state (pdev,PCI_D0 );if (err) { -printk (KERN_WARNING "%s: Could not put device into D0\n" , - dev->name); +dev_warn (&dev->dev,"Could not put device into D0\n" );return err; }
@@ -1432,7 +1440,7 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt)update_cr6 (db->cr6_data, dev->base_addr); dev->trans_start = jiffies; }else - printk(KERN_ERR DRV_NAME ": No Tx resource - Send_filter_frame!\n"); +pr_err ("No Tx resource - Send_filter_frame!\n" ); }
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 12/13 tulip/winbond-840.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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 Convert %d.%d.%d.%d to %pI4
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/tulip/winbond-840.c | 177 ++++++++++++++++++++------------------- 1 files changed, 90 insertions(+), 87 deletions(-)
drivers/net/tulip/winbond-840.c +90 -87
@@ -376,8 +376,8 @@ static int __devinit w840_probe1 (struct pci_dev *pdev, irq = pdev->irq;if (pci_set_dma_mask (pdev,DMA_BIT_MASK (32 ))) { -printk (KERN_WARNING "Winbond-840: Device %s disabled due to DMA limitations.\n" , -pci_name (pdev)); +pr_warning ("Winbond-840: Device %s disabled due to DMA limitations\n" , +pci_name (pdev));return -EIO ; } dev =alloc_etherdev (sizeof (*np));
@@ -422,8 +422,9 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,if (option &0x200 ) np->mii_if.full_duplex =1 ;if (option &15 ) -printk (KERN_INFO "%s: ignoring user supplied media type %d" , - dev->name, option &15 ); +dev_info (&dev->dev, +"ignoring user supplied media type %d" , + option &15 ); }if (find_cnt <MAX_UNITS && full_duplex[find_cnt] >0 ) np->mii_if.full_duplex =1 ;
@@ -440,9 +441,8 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,if (i) goto err_out_cleardev; -printk (KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n" , - dev->name, pci_id_tbl[chip_idx].name, ioaddr, - dev->dev_addr, irq); +dev_info (&dev->dev,"%s at %p, %pM, IRQ %d\n" , + pci_id_tbl[chip_idx].name, ioaddr, dev->dev_addr, irq);if (np->drv_flags & CanHaveMII) {int phy, phy_idx =0 ;
@@ -453,16 +453,17 @@ static int __devinit w840_probe1 (struct pci_dev *pdev, np->mii_if.advertising =mdio_read (dev, phy,MII_ADVERTISE ); np->mii = (mdio_read (dev, phy,MII_PHYSID1 ) <<16 )+mdio_read (dev, phy,MII_PHYSID2 ); -printk (KERN_INFO "%s: MII PHY %8.8xh found at address %d, status " -"0x%4.4x advertising %4.4x.\n" , - dev->name, np->mii, phy, mii_status, np->mii_if.advertising); +dev_info (&dev->dev, +"MII PHY %08xh found at address %d, status 0x%04x advertising %04x\n" , + np->mii, phy, mii_status, + np->mii_if.advertising); } } np->mii_cnt = phy_idx; np->mii_if.phy_id = np->phys[0 ];if (phy_idx ==0 ) { -printk (KERN_WARNING "%s: MII PHY not found -- this device may " -"not operate correctly.\n" , dev->name); +dev_warn (&dev->dev, +"MII PHY not found -- this device may not operate correctly\n" ); } }
@@ -644,8 +645,8 @@ static int netdev_open(struct net_device *dev) goto out_err;if (debug >1 ) -printk (KERN_DEBUG "%s: w89c840_open() irq %d.\n" , - dev->name, dev->irq); +printk (KERN_DEBUG "%s: w89c840_open() irq %d\n" , + dev->name, dev->irq);if ((i=alloc_ringdesc (dev))) goto out_err;
@@ -657,7 +658,7 @@ static int netdev_open(struct net_device *dev)netif_start_queue (dev);if (debug >2 ) -printk (KERN_DEBUG "%s: Done netdev_open().\n" , dev->name); +printk (KERN_DEBUG "%s: Done netdev_open()\n" , dev->name);/* Set the timer to check for link beat. */ init_timer (&np->timer);
@@ -688,16 +689,18 @@ static int update_link(struct net_device *dev)if (!(mii_reg &0x4 )) {if (netif_carrier_ok (dev)) {if (debug) -printk (KERN_INFO "%s: MII #%d reports no link. Disabling watchdog.\n" , - dev->name, np->phys[0 ]); +dev_info (&dev->dev, +"MII #%d reports no link. Disabling watchdog\n" , + np->phys[0 ]);netif_carrier_off (dev); }return np->csr6; }if (!netif_carrier_ok (dev)) {if (debug) -printk (KERN_INFO "%s: MII #%d link is back. Enabling watchdog.\n" , - dev->name, np->phys[0 ]); +dev_info (&dev->dev, +"MII #%d link is back. Enabling watchdog\n" , + np->phys[0 ]);netif_carrier_on (dev); }
@@ -729,9 +732,10 @@ static int update_link(struct net_device *dev)if (fasteth) result |=0x20000000 ;if (result != np->csr6 && debug) -printk (KERN_INFO "%s: Setting %dMBit-%s-duplex based on MII#%d\n" , - dev->name, fasteth ?100 :10 , - duplex ?"full" :"half" , np->phys[0 ]); +dev_info (&dev->dev, +"Setting %dMBit-%s-duplex based on MII#%d\n" , + fasteth ?100 :10 , duplex ?"full" :"half" , + np->phys[0 ]);return result; }
@@ -763,8 +767,8 @@ static inline void update_csr6(struct net_device *dev, int new) limit--;if (!limit) { -printk (KERN_INFO "%s: couldn't stop rxtx, IntrStatus %xh.\n" , - dev->name, csr5); +dev_info (&dev->dev, +"couldn't stop rxtx, IntrStatus %xh\n" , csr5);break ; }udelay (1 );
@@ -783,10 +787,9 @@ static void netdev_timer(unsigned long data)void __iomem *ioaddr = np->base_addr;if (debug >2 ) -printk (KERN_DEBUG "%s: Media selection timer tick, status %8.8x " -"config %8.8x.\n" , - dev->name,ioread32 (ioaddr + IntrStatus), -ioread32 (ioaddr + NetworkConfig)); +printk (KERN_DEBUG "%s: Media selection timer tick, status %08x config %08x\n" , + dev->name,ioread32 (ioaddr + IntrStatus), +ioread32 (ioaddr + NetworkConfig));spin_lock_irq (&np->lock);update_csr6 (dev,update_link (dev));spin_unlock_irq (&np->lock);
@@ -899,8 +902,8 @@ static void init_registers(struct net_device *dev)/* When not a module we can work around broken '486 PCI boards. */ if (boot_cpu_data.x86 <=4 ) { i |=0x4800 ; -printk (KERN_INFO "%s: This is a 386/486 PCI system, setting cache " -"alignment to 8 longwords.\n" , dev->name); +dev_info (&dev->dev, +"This is a 386/486 PCI system, setting cache alignment to 8 longwords\n" ); }else { i |=0xE000 ; }
@@ -931,22 +934,23 @@ static void tx_timeout(struct net_device *dev)struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->base_addr; -printk (KERN_WARNING "%s: Transmit timed out, status %8.8x," -" resetting...\n" , dev->name,ioread32 (ioaddr + IntrStatus)); +dev_warn (&dev->dev,"Transmit timed out, status %08x, resetting...\n" , +ioread32 (ioaddr + IntrStatus)); {int i;printk (KERN_DEBUG " Rx ring %p: " , np->rx_ring);for (i =0 ; i <RX_RING_SIZE ; i++) -printk (" %8.8x" , (unsigned int )np->rx_ring[i].status); -printk (KERN_DEBUG " Tx ring %p: " , np->tx_ring); +printk (KERN_CONT " %08x" , (unsigned int )np->rx_ring[i].status); +printk (KERN_CONT "\n" ); +printk (KERN_DEBUG " Tx ring %p: " , np->tx_ring);for (i =0 ; i <TX_RING_SIZE ; i++) -printk (" %8.8x" , np->tx_ring[i].status); -printk ("\n" ); +printk (KERN_CONT " %08x" , np->tx_ring[i].status); +printk (KERN_CONT "\n" ); } -printk (KERN_DEBUG "Tx cur %d Tx dirty %d Tx Full %d, q bytes %d.\n" , - np->cur_tx, np->dirty_tx, np->tx_full, np->tx_q_bytes); -printk (KERN_DEBUG "Tx Descriptor addr %xh.\n" ,ioread32 (ioaddr+0x4C )); +printk (KERN_DEBUG "Tx cur %d Tx dirty %d Tx Full %d, q bytes %d\n" , + np->cur_tx, np->dirty_tx, np->tx_full, np->tx_q_bytes); +printk (KERN_DEBUG "Tx Descriptor addr %xh\n" ,ioread32 (ioaddr+0x4C ));disable_irq (dev->irq);spin_lock_irq (&np->lock);
@@ -1055,8 +1059,8 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;if (debug >4 ) { -printk (KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n" , - dev->name, np->cur_tx, entry); +printk (KERN_DEBUG "%s: Transmit frame #%d queued in slot %d\n" , + dev->name, np->cur_tx, entry); }return NETDEV_TX_OK ; }
@@ -1073,8 +1077,8 @@ static void netdev_tx_done(struct net_device *dev)if (tx_status &0x8000 ) {/* There was an error, log it. */ #ifndef final_versionif (debug >1 ) -printk (KERN_DEBUG "%s: Transmit error, Tx status %8.8x.\n" , - dev->name, tx_status); +printk (KERN_DEBUG "%s: Transmit error, Tx status %08x\n" , + dev->name, tx_status);#endif np->stats.tx_errors++;if (tx_status &0x0104 ) np->stats.tx_aborted_errors++;
@@ -1086,8 +1090,8 @@ static void netdev_tx_done(struct net_device *dev) }else {#ifndef final_versionif (debug >3 ) -printk (KERN_DEBUG "%s: Transmit slot %d ok, Tx status %8.8x.\n" , - dev->name, entry, tx_status); +printk (KERN_DEBUG "%s: Transmit slot %d ok, Tx status %08x\n" , + dev->name, entry, tx_status);#endif np->stats.tx_bytes += np->tx_skbuff[entry]->len; np->stats.collisions += (tx_status >>3 ) &15 ;
@@ -1130,8 +1134,8 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)iowrite32 (intr_status &0x001ffff , ioaddr + IntrStatus);if (debug >4 ) -printk (KERN_DEBUG "%s: Interrupt, status %4.4x.\n" , - dev->name, intr_status); +printk (KERN_DEBUG "%s: Interrupt, status %04x\n" , + dev->name, intr_status);if ((intr_status & (NormalIntr|AbnormalIntr)) ==0 )break ;
@@ -1156,8 +1160,9 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)netdev_error (dev, intr_status);if (--work_limit <0 ) { -printk (KERN_WARNING "%s: Too much work at interrupt, " -"status=0x%4.4x.\n" , dev->name, intr_status); +dev_warn (&dev->dev, +"Too much work at interrupt, status=0x%04x\n" , + intr_status);/* Set the timer to re-enable the other interrupts after 10*82usec ticks. */ spin_lock (&np->lock);
@@ -1171,8 +1176,8 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) }while (1 );if (debug >3 ) -printk (KERN_DEBUG "%s: exiting interrupt, status=%#4.4x.\n" , - dev->name,ioread32 (ioaddr + IntrStatus)); +printk (KERN_DEBUG "%s: exiting interrupt, status=%#4.4x\n" , + dev->name,ioread32 (ioaddr + IntrStatus));return IRQ_RETVAL (handled); }
@@ -1185,8 +1190,8 @@ static int netdev_rx(struct net_device *dev)int work_limit = np->dirty_rx +RX_RING_SIZE - np->cur_rx;if (debug >4 ) { -printk (KERN_DEBUG " In netdev_rx(), entry %d status %4.4x.\n" , - entry, np->rx_ring[entry].status); +printk (KERN_DEBUG " In netdev_rx(), entry %d status %04x\n" , + entry, np->rx_ring[entry].status); }/* If EOP is set on the next entry, it's a new packet. Send it up. */
@@ -1195,24 +1200,24 @@ static int netdev_rx(struct net_device *dev)s32 status = desc->status;if (debug >4 ) -printk (KERN_DEBUG " netdev_rx() status was %8.8x.\n" , - status); +printk (KERN_DEBUG " netdev_rx() status was %08x\n" , + status);if (status <0 )break ;if ((status &0x38008300 ) !=0x0300 ) {if ((status &0x38000300 ) !=0x0300 ) {/* Ingore earlier buffers. */ if ((status &0xffff ) !=0x7fff ) { -printk (KERN_WARNING "%s: Oversized Ethernet frame spanned " -"multiple buffers, entry %#x status %4.4x!\n" , - dev->name, np->cur_rx, status); +dev_warn (&dev->dev, +"Oversized Ethernet frame spanned multiple buffers, entry %#x status %04x!\n" , + np->cur_rx, status); np->stats.rx_length_errors++; } }else if (status &0x8000 ) {/* There was a fatal error. */ if (debug >2 ) -printk (KERN_DEBUG "%s: Receive error, Rx status %8.8x.\n" , - dev->name, status); +printk (KERN_DEBUG "%s: Receive error, Rx status %08x\n" , + dev->name, status); np->stats.rx_errors++;/* end of a packet.*/ if (status &0x0890 ) np->stats.rx_length_errors++;if (status &0x004C ) np->stats.rx_frame_errors++;
@@ -1225,8 +1230,8 @@ static int netdev_rx(struct net_device *dev)#ifndef final_versionif (debug >4 ) -printk (KERN_DEBUG " netdev_rx() normal Rx pkt length %d" -" status %x.\n" , pkt_len, status); +printk (KERN_DEBUG " netdev_rx() normal Rx pkt length %d status %x\n" , + pkt_len, status);#endif /* Check if the packet is long enough to accept without copying to a minimally-sized skbuff. */
@@ -1251,11 +1256,10 @@ static int netdev_rx(struct net_device *dev)#ifndef final_version/* Remove after testing. */ /* You will want this info for the initial debug. */ if (debug >5 ) -printk (KERN_DEBUG " Rx data %pM %pM" -" %2.2x%2.2x %d.%d.%d.%d.\n" , +printk (KERN_DEBUG " Rx data %pM %pM %02x%02x %pI4\n" , &skb->data[0 ], &skb->data[6 ], skb->data[12 ], skb->data[13 ], - skb->data[14 ], skb->data[15 ], skb->data[16 ], skb->data[17 ]); + &skb->data[14 ]);#endif skb->protocol =eth_type_trans (skb, dev);netif_rx (skb);
@@ -1293,8 +1297,8 @@ static void netdev_error(struct net_device *dev, int intr_status)void __iomem *ioaddr = np->base_addr;if (debug >2 ) -printk (KERN_DEBUG "%s: Abnormal event, %8.8x.\n" , - dev->name, intr_status); +printk (KERN_DEBUG "%s: Abnormal event, %08x\n" , + dev->name, intr_status);if (intr_status ==0xffffffff )return ;spin_lock (&np->lock);
@@ -1314,8 +1318,8 @@ static void netdev_error(struct net_device *dev, int intr_status) new =127 ;/* load full packet before starting */ new = (np->csr6 & ~(0x7F <<14 )) | (new<<14 );#endif -printk (KERN_DEBUG "%s: Tx underflow, new csr6 %8.8x.\n" , - dev->name, new); +printk (KERN_DEBUG "%s: Tx underflow, new csr6 %08x\n" , + dev->name, new);update_csr6 (dev, new); }if (intr_status & RxDied) {/* Missed a Rx frame. */
@@ -1487,11 +1491,13 @@ static int netdev_close(struct net_device *dev)netif_stop_queue (dev);if (debug >1 ) { -printk (KERN_DEBUG "%s: Shutting down ethercard, status was %8.8x " -"Config %8.8x.\n" , dev->name,ioread32 (ioaddr + IntrStatus), -ioread32 (ioaddr + NetworkConfig)); -printk (KERN_DEBUG "%s: Queue pointers were Tx %d / %d, Rx %d / %d.\n" , - dev->name, np->cur_tx, np->dirty_tx, np->cur_rx, np->dirty_rx); +printk (KERN_DEBUG "%s: Shutting down ethercard, status was %08x Config %08x\n" , + dev->name,ioread32 (ioaddr + IntrStatus), +ioread32 (ioaddr + NetworkConfig)); +printk (KERN_DEBUG "%s: Queue pointers were Tx %d / %d, Rx %d / %d\n" , + dev->name, + np->cur_tx, np->dirty_tx, + np->cur_rx, np->dirty_rx); }/* Stop the chip's Tx and Rx processes. */
@@ -1512,18 +1518,16 @@ static int netdev_close(struct net_device *dev)if (debug >2 ) {int i; -printk (KERN_DEBUG " Tx ring at %8.8x:\n" , - (int )np->tx_ring); +printk (KERN_DEBUG " Tx ring at %08x:\n" , (int )np->tx_ring);for (i =0 ; i <TX_RING_SIZE ; i++) -printk (KERN_DEBUG " #%d desc. %4.4x %4.4x %8.8x.\n" , - i, np->tx_ring[i].length, - np->tx_ring[i].status, np->tx_ring[i].buffer1); -printk (KERN_DEBUG " Rx ring %8.8x:\n" , - (int )np->rx_ring); +printk (KERN_DEBUG " #%d desc. %04x %04x %08x\n" , + i, np->tx_ring[i].length, + np->tx_ring[i].status, np->tx_ring[i].buffer1); +printk (KERN_DEBUG " Rx ring %08x:\n" , (int )np->rx_ring);for (i =0 ; i <RX_RING_SIZE ; i++) { -printk (KERN_DEBUG " #%d desc. %4.4x %4.4x %8.8x\n" , - i, np->rx_ring[i].length, - np->rx_ring[i].status, np->rx_ring[i].buffer1); +printk (KERN_DEBUG " #%d desc. %04x %04x %08x\n" , + i, np->rx_ring[i].length, + np->rx_ring[i].status, np->rx_ring[i].buffer1); } }#endif /* __i386__ debugging only */
@@ -1622,9 +1626,8 @@ static int w840_resume (struct pci_dev *pdev) goto out;/* device not suspended */ if (netif_running (dev)) {if ((retval =pci_enable_device (pdev))) { -printk (KERN_ERR -"%s: pci_enable_device failed in resume\n" , - dev->name); +dev_err (&dev->dev, +"pci_enable_device failed in resume\n" ); goto out; }spin_lock_irq (&np->lock);
Signature · 1 line
1.6.6.rc0.57.gad7a
PATCH 13/13 tulip/xircom_cb.c: Use dev_<level> and pr_<level>
In reply to Joe PerchesConvert 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
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Remove DRV_NAME and xircom_cb from pr_<level>
Convert embedded function names in logging messages to %s, __func__
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/tulip/xircom_cb.c | 44 +++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 19 deletions(-)
drivers/net/tulip/xircom_cb.c +25 -19
@@ -14,6 +14,8 @@* $Id: xircom_cb.c,v 1.33 2001/03/19 14:02:07 arjanv Exp $ */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/kernel.h> #include <linux/string.h>
@@ -234,7 +236,7 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_pci_write_config_word (pdev,PCI_STATUS ,tmp16);if (!request_region (pci_resource_start (pdev,0 ),128 ,"xircom_cb" )) { -printk (KERN_ERR "xircom_probe: failed to allocate io-region\n" ); +pr_err ("%s: failed to allocate io-region\n" , __func__);return -ENODEV ; }
@@ -245,7 +247,7 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_*/ dev =alloc_etherdev (sizeof (struct xircom_private ));if (!dev) { -printk (KERN_ERR "xircom_probe: failed to allocate etherdev\n" ); +pr_err ("%s: failed to allocate etherdev\n" , __func__); goto device_fail; } private =netdev_priv (dev);
@@ -253,12 +255,12 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_/* Allocate the send/receive buffers */ private->rx_buffer =pci_alloc_consistent (pdev,8192 ,&private->rx_dma_handle);if (private->rx_buffer ==NULL ) { -printk (KERN_ERR "xircom_probe: no memory for rx buffer \n" ); +pr_err ("%s: no memory for rx buffer\n" , __func__); goto rx_buf_fail; } private->tx_buffer =pci_alloc_consistent (pdev,8192 ,&private->tx_dma_handle);if (private->tx_buffer ==NULL ) { -printk (KERN_ERR "xircom_probe: no memory for tx buffer \n" ); +pr_err ("%s: no memory for tx buffer\n" , __func__); goto tx_buf_fail; }
@@ -281,11 +283,12 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_pci_set_drvdata (pdev, dev);if (register_netdev (dev)) { -printk (KERN_ERR "xircom_probe: netdevice registration failed.\n" ); +pr_err ("%s: netdevice registration failed\n" , __func__); goto reg_fail; } -printk (KERN_INFO "%s: Xircom cardbus revision %i at irq %i \n" , dev->name, pdev->revision, pdev->irq); +dev_info (&dev->dev,"Xircom cardbus revision %i at irq %i\n" , + pdev->revision, pdev->irq);/* start the transmitter to get a heartbeat */ /* TODO: send 2 dummy packets here */ transceiver_voodoo (private);
@@ -347,8 +350,10 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)#ifdef DEBUG print_binary (status); -printk ("tx status 0x%08x 0x%08x \n" ,card->tx_buffer[0 ],card->tx_buffer[4 ]); -printk ("rx status 0x%08x 0x%08x \n" ,card->rx_buffer[0 ],card->rx_buffer[4 ]); +printk ("tx status 0x%08x 0x%08x \n" , + card->tx_buffer[0 ], card->tx_buffer[4 ]); +printk ("rx status 0x%08x 0x%08x \n" , + card->rx_buffer[0 ], card->rx_buffer[4 ]);#endif /* Handle shared irq and hotplug */ if (status ==0 || status ==0xffffffff ) {
@@ -358,9 +363,9 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)if (link_status_changed (card)) {int newlink; -printk (KERN_DEBUG "xircom_cb: Link status has changed \n" ); +printk (KERN_DEBUG "xircom_cb: Link status has changed\n" ); newlink =link_status (card); -printk (KERN_INFO "xircom_cb: Link is %i mbit \n" ,newlink); +dev_info (&dev->dev,"Link is %i mbit\n" , newlink);if (newlink)netif_carrier_on (dev);else
@@ -457,7 +462,8 @@ static int xircom_open(struct net_device *dev)struct xircom_private *xp =netdev_priv (dev);int retval;enter ("xircom_open" ); -printk (KERN_INFO "xircom cardbus adaptor found, registering as %s, using irq %i \n" ,dev->name,dev->irq); +pr_info ("xircom cardbus adaptor found, registering as %s, using irq %i \n" , + dev->name, dev->irq); retval =request_irq (dev->irq, xircom_interrupt,IRQF_SHARED , dev->name, dev);if (retval) {leave ("xircom_open - No IRQ" );
@@ -770,7 +776,7 @@ static void activate_receiver(struct xircom_private *card)udelay (50 ); counter--;if (counter <=0 ) -printk (KERN_ERR "xircom_cb: Receiver failed to deactivate\n" ); +pr_err ("Receiver failed to deactivate\n" ); }/* enable the receiver */
@@ -787,7 +793,7 @@ static void activate_receiver(struct xircom_private *card)udelay (50 ); counter--;if (counter <=0 ) -printk (KERN_ERR "xircom_cb: Receiver failed to re-activate\n" ); +pr_err ("Receiver failed to re-activate\n" ); }leave ("activate_receiver" );
@@ -818,7 +824,7 @@ static void deactivate_receiver(struct xircom_private *card)udelay (50 ); counter--;if (counter <=0 ) -printk (KERN_ERR "xircom_cb: Receiver failed to deactivate\n" ); +pr_err ("Receiver failed to deactivate\n" ); }
@@ -861,7 +867,7 @@ static void activate_transmitter(struct xircom_private *card)udelay (50 ); counter--;if (counter <=0 ) -printk (KERN_ERR "xircom_cb: Transmitter failed to deactivate\n" ); +pr_err ("Transmitter failed to deactivate\n" ); }/* enable the transmitter */
@@ -878,7 +884,7 @@ static void activate_transmitter(struct xircom_private *card)udelay (50 ); counter--;if (counter <=0 ) -printk (KERN_ERR "xircom_cb: Transmitter failed to re-activate\n" ); +pr_err ("Transmitter failed to re-activate\n" ); }leave ("activate_transmitter" );
@@ -909,7 +915,7 @@ static void deactivate_transmitter(struct xircom_private *card)udelay (50 ); counter--;if (counter <=0 ) -printk (KERN_ERR "xircom_cb: Transmitter failed to deactivate\n" ); +pr_err ("Transmitter failed to deactivate\n" ); }
@@ -1184,7 +1190,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pristruct sk_buff *skb;if (pkt_len >1518 ) { -printk (KERN_ERR "xircom_cb: Packet length %i is bogus \n" ,pkt_len); +pr_err ("Packet length %i is bogus\n" , pkt_len); pkt_len =1518 ; }
@@ -1222,7 +1228,7 @@ static void investigate_write_descriptor(struct net_device *dev, struct xircom_p status =le32_to_cpu (card->tx_buffer[4 *descnr]);#if 0 if (status &0x8000 ) {/* Major error */ -printk (KERN_ERR "Major transmit error status %x \n" , status); +pr_err ("Major transmit error status %x\n" , status); card->tx_buffer[4 *descnr] =0 ;netif_wake_queue (dev); }
Signature · 1 line
1.6.6.rc0.57.gad7a
David Miller
maintainerFrom: Joe Perches <[email protected]>
Date: Thu, 28 Jan 2010 22:59:16 -0800
Quoted 6 lines
Joe Perches (13):
tulip_core: Use dev_<level> and pr_<level>
tulip/21142.c: Use dev_<level> and pr_<level>
tulip/de2104x.c: Use dev_<level> and pr_<level>
tulip/dmfe.c: Use dev_<level> and pr_<level>
tulip/eeprom.c: Use dev_<level> and pr_<level>
Quoted 8 lines
tulip/interrupt.c: Use dev_<level> and pr_<level>tulip/media.c: Use dev_<level> and pr_<level>tulip/pnic.c: Use dev_<level> and pr_<level>tulip/pnic2.c: Use dev_<level> and pr_<level>tulip/timer.c: Use dev_<level> and pr_<level>tulip/uli526x.c: Use dev_<level> and pr_<level>tulip/winbond-840.c: Use dev_<level> and pr_<level>tulip/xircom_cb.c: Use dev_<level> and pr_<level>
All applied, thanks Joe.