r6040: make printks consistent with DRV_NAME
Subsystems (2)
PATCH 1/4 r6040: make printks consistent with DRV_NAME
From: Florian Fainelli <[email protected]>
Subject: [PATCH 1/4] r6040: make printks consistent with DRV_NAME
This patch fixes some printks which were not prefixed with DRV_NAME, useful when having multiple cards/drivers on the system.
Signed-off-by Florian Fainelli <[email protected]>
---
drivers/net/r6040.c +7 -7
@@ -200,7 +200,7 @@ struct r6040_private { static char version[] __devinitdata = KERN_INFO DRV_NAME": RDC R6040 NAPI net driver," -"version " DRV_VERSION " (" DRV_RELDATE ")\n" ; +"version " DRV_VERSION " (" DRV_RELDATE ")" ;static int phy_table[] = {PHY1_ADDR ,PHY2_ADDR };
@@ -330,7 +330,7 @@ static int r6040_alloc_rxbufs(struct net_device *dev) do { skb = netdev_alloc_skb(dev, MAX_BUF_SIZE); if (!skb) { - printk(KERN_ERR "%s: failed to alloc skb for rx\n", dev->name); + printk(KERN_ERR DRV_NAME "%s: failed to alloc skb for rx\n", dev->name); rc = -ENOMEM; goto err_exit; }
@@ -1063,20 +1063,20 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,/* this should always be supported */ err =pci_set_dma_mask (pdev,DMA_32BIT_MASK );if (err) { - printk(KERN_ERR DRV_NAME "32-bit PCI DMA addresses" + printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses" "not supported by the card\n"); goto err_out; } err =pci_set_consistent_dma_mask (pdev,DMA_32BIT_MASK );if (err) { - printk(KERN_ERR DRV_NAME "32-bit PCI DMA addresses" + printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses" "not supported by the card\n"); goto err_out; }/* IO Size check */ if (pci_resource_len (pdev,0 ) < io_size) { - printk(KERN_ERR DRV_NAME "Insufficient PCI resources, aborting\n"); + printk(KERN_ERR DRV_NAME ": Insufficient PCI resources, aborting\n"); err = -EIO ; goto err_out; }
@@ -1086,7 +1086,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, dev =alloc_etherdev (sizeof (struct r6040_private ));if (!dev) { - printk(KERN_ERR DRV_NAME "Failed to allocate etherdev\n"); + printk(KERN_ERR DRV_NAME ": Failed to allocate etherdev\n"); err = -ENOMEM ; goto err_out; }
@@ -1102,7 +1102,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, ioaddr =pci_iomap (pdev, bar, io_size);if (!ioaddr) { -printk (KERN_ERR "ioremap failed for device %s\n" , + printk(KERN_ERR DRV_NAME ": ioremap failed for device %s\n", pci_name(pdev)); err = -EIO ; goto err_out_free_res;
From: Florian Fainelli <[email protected]>
Date: Wed, 7 Jan 2009 17:40:30 +0100
Quoted 7 lines
r6040: make printks consistent with
DRV_NAMEThis patch fixes some printks which were not prefixed with
DRV_NAME, useful when having multiple cards/drivers on the system.Signed-off-by Florian Fainelli <[email protected]>
Applied.