Commit 88d2b81f authored by Don Skidmore's avatar Don Skidmore Committed by David S. Miller

ixgbe: Fix SFP log messages

We had a wide range of log messages for the same sort of SFP
failure.  This patch makes them all more similar and less
confusing along with converting them to dev_err.
Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d9d62f3f
...@@ -2701,7 +2701,10 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter) ...@@ -2701,7 +2701,10 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
*/ */
err = hw->phy.ops.identify(hw); err = hw->phy.ops.identify(hw);
if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) { if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
DPRINTK(PROBE, ERR, "PHY not supported on this NIC %d\n", err); dev_err(&adapter->pdev->dev, "failed to initialize because "
"an unsupported SFP+ module type was detected.\n"
"Reload the driver after installing a supported "
"module.\n");
ixgbe_down(adapter); ixgbe_down(adapter);
return err; return err;
} }
...@@ -3720,8 +3723,9 @@ static void ixgbe_sfp_task(struct work_struct *work) ...@@ -3720,8 +3723,9 @@ static void ixgbe_sfp_task(struct work_struct *work)
goto reschedule; goto reschedule;
ret = hw->phy.ops.reset(hw); ret = hw->phy.ops.reset(hw);
if (ret == IXGBE_ERR_SFP_NOT_SUPPORTED) { if (ret == IXGBE_ERR_SFP_NOT_SUPPORTED) {
DPRINTK(PROBE, ERR, "failed to initialize because an " dev_err(&adapter->pdev->dev, "failed to initialize "
"unsupported SFP+ module type was detected.\n" "because an unsupported SFP+ module type "
"was detected.\n"
"Reload the driver after installing a " "Reload the driver after installing a "
"supported module.\n"); "supported module.\n");
unregister_netdev(adapter->netdev); unregister_netdev(adapter->netdev);
...@@ -4526,7 +4530,10 @@ static void ixgbe_sfp_config_module_task(struct work_struct *work) ...@@ -4526,7 +4530,10 @@ static void ixgbe_sfp_config_module_task(struct work_struct *work)
adapter->flags |= IXGBE_FLAG_IN_SFP_MOD_TASK; adapter->flags |= IXGBE_FLAG_IN_SFP_MOD_TASK;
err = hw->phy.ops.identify_sfp(hw); err = hw->phy.ops.identify_sfp(hw);
if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) { if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
DPRINTK(PROBE, ERR, "PHY not supported on this NIC %d\n", err); dev_err(&adapter->pdev->dev, "failed to initialize because "
"an unsupported SFP+ module type was detected.\n"
"Reload the driver after installing a supported "
"module.\n");
ixgbe_down(adapter); ixgbe_down(adapter);
return; return;
} }
...@@ -5513,8 +5520,10 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, ...@@ -5513,8 +5520,10 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
round_jiffies(jiffies + (2 * HZ))); round_jiffies(jiffies + (2 * HZ)));
err = 0; err = 0;
} else if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) { } else if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
dev_err(&adapter->pdev->dev, "failed to load because an " dev_err(&adapter->pdev->dev, "failed to initialize because "
"unsupported SFP+ module type was detected.\n"); "an unsupported SFP+ module type was detected.\n"
"Reload the driver after installing a supported "
"module.\n");
goto err_sw_init; goto err_sw_init;
} else if (err) { } else if (err) {
dev_err(&adapter->pdev->dev, "HW Init failed: %d\n", err); dev_err(&adapter->pdev->dev, "HW Init failed: %d\n", err);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment