Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a48ce84 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

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: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1d8f601

drivers/net/r6040.c

+7 −7
Original line number Diff line number Diff line
@@ -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;

		}
@@ -1077,20 +1077,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;

	}
@@ -1100,7 +1100,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;

	}
@@ -1116,7 +1116,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;