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

Commit 090b1795 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: add pci_dev in few spots to clean up use of dev_err/info/warn 



This patch relpaces several references to adapter->pdev->dev with just
pdev->dev.  This allows for cleanup of several multiline dev_err/info
calls.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 330a6d6a

drivers/net/igb/igb_main.c

+12 −12
Original line number Diff line number Diff line
@@ -1173,6 +1173,7 @@ void igb_reinit_locked(struct igb_adapter *adapter) 


void igb_reset(struct igb_adapter *adapter)

{

	struct pci_dev *pdev = adapter->pdev;

	struct e1000_hw *hw = &adapter->hw;

	struct e1000_mac_info *mac = &hw->mac;

	struct e1000_fc_info *fc = &hw->fc;
@@ -1275,7 +1276,7 @@ void igb_reset(struct igb_adapter *adapter) 
	wr32(E1000_WUC, 0);



	if (hw->mac.ops.init_hw(hw))

		dev_err(&adapter->pdev->dev, "Hardware Error\n");

		dev_err(&pdev->dev, "Hardware Error\n");



	igb_update_mng_vlan(adapter);
@@ -3704,17 +3705,18 @@ static struct net_device_stats *igb_get_stats(struct net_device *netdev) 
static int igb_change_mtu(struct net_device *netdev, int new_mtu)

{

	struct igb_adapter *adapter = netdev_priv(netdev);

	struct pci_dev *pdev = adapter->pdev;

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;

	u32 rx_buffer_len, i;



	if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||

	    (max_frame > MAX_JUMBO_FRAME_SIZE)) {

		dev_err(&adapter->pdev->dev, "Invalid MTU setting\n");

		dev_err(&pdev->dev, "Invalid MTU setting\n");

		return -EINVAL;

	}



	if (max_frame > MAX_STD_JUMBO_FRAME_SIZE) {

		dev_err(&adapter->pdev->dev, "MTU > 9216 not supported.\n");

		dev_err(&pdev->dev, "MTU > 9216 not supported.\n");

		return -EINVAL;

	}
@@ -3739,7 +3741,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) 
	if (netif_running(netdev))

		igb_down(adapter);



	dev_info(&adapter->pdev->dev, "changing MTU from %d to %d\n",

	dev_info(&pdev->dev, "changing MTU from %d to %d\n",

		 netdev->mtu, new_mtu);

	netdev->mtu = new_mtu;
@@ -4053,6 +4055,7 @@ static int __igb_notify_dca(struct device *dev, void *data) 
{

	struct net_device *netdev = dev_get_drvdata(dev);

	struct igb_adapter *adapter = netdev_priv(netdev);

	struct pci_dev *pdev = adapter->pdev;

	struct e1000_hw *hw = &adapter->hw;

	unsigned long event = *(unsigned long *)data;
@@ -4061,12 +4064,9 @@ static int __igb_notify_dca(struct device *dev, void *data) 
		/* if already enabled, don't do it again */

		if (adapter->flags & IGB_FLAG_DCA_ENABLED)

			break;

		/* Always use CB2 mode, difference is masked

		 * in the CB driver. */

		wr32(E1000_DCA_CTRL, E1000_DCA_CTRL_DCA_MODE_CB2);

		if (dca_add_requester(dev) == 0) {

			adapter->flags |= IGB_FLAG_DCA_ENABLED;

			dev_info(&adapter->pdev->dev, "DCA enabled\n");

			dev_info(&pdev->dev, "DCA enabled\n");

			igb_setup_dca(adapter);

			break;

		}
@@ -4076,7 +4076,7 @@ static int __igb_notify_dca(struct device *dev, void *data) 
			/* without this a class_device is left

			 * hanging around in the sysfs model */

			dca_remove_requester(dev);

			dev_info(&adapter->pdev->dev, "DCA disabled\n");

			dev_info(&pdev->dev, "DCA disabled\n");

			adapter->flags &= ~IGB_FLAG_DCA_ENABLED;

			wr32(E1000_DCA_CTRL, E1000_DCA_CTRL_DCA_MODE_DISABLE);

		}
@@ -4471,7 +4471,7 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf) 
		retval = igb_set_vf_vlan(adapter, msgbuf, vf);

		break;

	default:

		dev_err(&adapter->pdev->dev, "Unhandled Msg %08x\n", msgbuf[0]);

		dev_err(&pdev->dev, "Unhandled Msg %08x\n", msgbuf[0]);

		retval = -1;

		break;

	}
@@ -5472,6 +5472,7 @@ static void igb_restore_vlan(struct igb_adapter *adapter) 


int igb_set_spd_dplx(struct igb_adapter *adapter, u16 spddplx)

{

	struct pci_dev *pdev = adapter->pdev;

	struct e1000_mac_info *mac = &adapter->hw.mac;



	mac->autoneg = 0;
@@ -5495,8 +5496,7 @@ int igb_set_spd_dplx(struct igb_adapter *adapter, u16 spddplx) 
		break;

	case SPEED_1000 + DUPLEX_HALF: /* not supported */

	default:

		dev_err(&adapter->pdev->dev,

			"Unsupported Speed/Duplex configuration\n");

		dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration\n");

		return -EINVAL;

	}

	return 0;