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

Commit 2445e461 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Replace pr_err with sensible alternatives 



All the instances of pr_err() in the tg3 driver have better
alternatives.  This patch replaces all pr_err() calls.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Reviewed-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d40db7b

drivers/net/tg3.c

+26 −20
Original line number Diff line number Diff line
@@ -6433,7 +6433,8 @@ static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, u32 enable_bit, int 
	}



	if (i == MAX_WAIT_CNT && !silent) {

		pr_err("tg3_stop_block timed out, ofs=%lx enable_bit=%x\n",

		dev_err(&tp->pdev->dev,

			"tg3_stop_block timed out, ofs=%lx enable_bit=%x\n",

			ofs, enable_bit);

		return -ENODEV;

	}
@@ -10648,7 +10649,8 @@ static int tg3_test_registers(struct tg3 *tp) 


out:

	if (netif_msg_hw(tp))

		pr_err("Register test failed at offset %x\n", offset);

		netdev_err(tp->dev,

			   "Register test failed at offset %x\n", offset);

	tw32(offset, save_val);

	return -EIO;

}
@@ -13223,7 +13225,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
		   (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {

		tp->pcix_cap = pci_find_capability(tp->pdev, PCI_CAP_ID_PCIX);

		if (!tp->pcix_cap) {

			pr_err("Cannot find PCI-X capability, aborting\n");

			dev_err(&tp->pdev->dev,

				"Cannot find PCI-X capability, aborting\n");

			return -EIO;

		}
@@ -13420,7 +13423,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	/* Force the chip into D0. */

	err = tg3_set_power_state(tp, PCI_D0);

	if (err) {

		pr_err("(%s) transition to D0 failed\n", pci_name(tp->pdev));

		dev_err(&tp->pdev->dev, "Transition to D0 failed\n");

		return err;

	}
@@ -13594,8 +13597,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 


	err = tg3_phy_probe(tp);

	if (err) {

		pr_err("(%s) phy probe failed, err %d\n",

		       pci_name(tp->pdev), err);

		dev_err(&tp->pdev->dev, "phy probe failed, err %d\n", err);

		/* ... but do not return immediately ... */

		tg3_mdio_fini(tp);

	}
@@ -14104,8 +14106,9 @@ static int __devinit tg3_test_dma(struct tg3 *tp) 
		/* Send the buffer to the chip. */

		ret = tg3_do_test_dma(tp, buf, buf_dma, TEST_BUFFER_SIZE, 1);

		if (ret) {

			pr_err("tg3_test_dma() Write the buffer failed %d\n",

			       ret);

			dev_err(&tp->pdev->dev,

				"%s: Buffer write failed. err = %d\n",

				__func__, ret);

			break;

		}
@@ -14115,8 +14118,9 @@ static int __devinit tg3_test_dma(struct tg3 *tp) 
			u32 val;

			tg3_read_mem(tp, 0x2100 + (i*4), &val);

			if (le32_to_cpu(val) != p[i]) {

				pr_err("  tg3_test_dma()  Card buffer corrupted on write! (%d != %d)\n",

				       val, i);

				dev_err(&tp->pdev->dev,

					"%s: Buffer corrupted on device! "

					"(%d != %d)\n", __func__, val, i);

				/* ret = -ENODEV here? */

			}

			p[i] = 0;
@@ -14125,9 +14129,9 @@ static int __devinit tg3_test_dma(struct tg3 *tp) 
		/* Now read it back. */

		ret = tg3_do_test_dma(tp, buf, buf_dma, TEST_BUFFER_SIZE, 0);

		if (ret) {

			pr_err("tg3_test_dma() Read the buffer failed %d\n",

			       ret);



			dev_err(&tp->pdev->dev,

				"%s: Buffer read failed. err = %d\n",

				__func__, ret);

			break;

		}
@@ -14143,8 +14147,9 @@ static int __devinit tg3_test_dma(struct tg3 *tp) 
				tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);

				break;

			} else {

				pr_err("tg3_test_dma() buffer corrupted on read back! (%d != %d)\n",

				       p[i], i);

				dev_err(&tp->pdev->dev,

					"%s: Buffer corrupted on read back! "

					"(%d != %d)\n", __func__, p[i], i);

				ret = -ENODEV;

				goto out;

			}
@@ -14436,13 +14441,13 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 


	err = pci_enable_device(pdev);

	if (err) {

		pr_err("Cannot enable PCI device, aborting\n");

		dev_err(&pdev->dev, "Cannot enable PCI device, aborting\n");

		return err;

	}



	err = pci_request_regions(pdev, DRV_MODULE_NAME);

	if (err) {

		pr_err("Cannot obtain PCI resources, aborting\n");

		dev_err(&pdev->dev, "Cannot obtain PCI resources, aborting\n");

		goto err_out_disable_pdev;

	}
@@ -14451,14 +14456,15 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 
	/* Find power-management capability. */

	pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);

	if (pm_cap == 0) {

		pr_err("Cannot find PowerManagement capability, aborting\n");

		dev_err(&pdev->dev,

			"Cannot find Power Management capability, aborting\n");

		err = -EIO;

		goto err_out_free_res;

	}



	dev = alloc_etherdev_mq(sizeof(*tp), TG3_IRQ_MAX_VECS);

	if (!dev) {

		pr_err("Etherdev alloc failed, aborting\n");

		dev_err(&pdev->dev, "Etherdev alloc failed, aborting\n");

		err = -ENOMEM;

		goto err_out_free_res;

	}