evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

r6040: make printks consistent with DRV_NAME

Browse source 
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 <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2009-01-08 11:00:52 -08:00 • committed by David S. Miller
parent a1d8f6015e
commit 9a48ce8400
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/r6040.c
View file

@ -200,7 +200,7 @@ struct r6040_private {
static char version[] __devinitdata = KERN_INFO DRV_NAME static char version[] __devinitdata = KERN_INFO DRV_NAME
": RDC R6040 NAPI net driver," ": RDC R6040 NAPI net driver,"
"version "DRV_VERSION " (" DRV_RELDATE ")\n"; "version "DRV_VERSION " (" DRV_RELDATE ")";
static int phy_table[] = { PHY1_ADDR, PHY2_ADDR }; static int phy_table[] = { PHY1_ADDR, PHY2_ADDR };
@ -330,7 +330,7 @@ static int r6040_alloc_rxbufs(struct net_device *dev)
do { do {
skb = netdev_alloc_skb(dev, MAX_BUF_SIZE); skb = netdev_alloc_skb(dev, MAX_BUF_SIZE);
if (!skb) { 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; rc = -ENOMEM;
goto err_exit; goto err_exit;
} }
@ -1077,20 +1077,20 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
/* this should always be supported */ /* this should always be supported */
err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (err) { 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"); "not supported by the card\n");
goto err_out; goto err_out;
} }
err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (err) { 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"); "not supported by the card\n");
goto err_out; goto err_out;
} }
/* IO Size check */ /* IO Size check */
if (pci_resource_len(pdev, 0) < io_size) { 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; err = -EIO;
goto err_out; goto err_out;
} }
@ -1100,7 +1100,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
dev = alloc_etherdev(sizeof(struct r6040_private)); dev = alloc_etherdev(sizeof(struct r6040_private));
if (!dev) { if (!dev) {
printk(KERN_ERR DRV_NAME "Failed to allocate etherdev\n"); printk(KERN_ERR DRV_NAME ": Failed to allocate etherdev\n");
err = -ENOMEM; err = -ENOMEM;
goto err_out; goto err_out;
} }
@ -1116,7 +1116,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
ioaddr = pci_iomap(pdev, bar, io_size); ioaddr = pci_iomap(pdev, bar, io_size);
if (!ioaddr) { 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)); pci_name(pdev));
err = -EIO; err = -EIO;
goto err_out_free_res; goto err_out_free_res;