be2net: fix some log messages

This patch fixes the following minor issues with log messages in be2net:
  1) Period is not required at the end of log message.
  2) Remove "Unknown grp5 event" logs to reduce noise. The driver can safely
     ignore async events from FW it's not interested in.
  3) Reword a log message for better readability to say that SRIOV
     "is disabled" rather than "not supported".

Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 5be100d1bc0ae4e935d302817a90dde5a91fe64d..d6685aba892fe2be97daa494baa7758a25488f8b 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -309,8 +309,6 @@ static void be_async_grp5_evt_process(struct be_adapter *adapter,
                be_async_grp5_pvid_state_process(adapter, compl);
                break;
        default:
-               dev_warn(&adapter->pdev->dev, "Unknown grp5 event 0x%x!\n",
-                        event_type);
                break;
        }
 }

diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 2fd38261bedb17c7ff8118a7ea7b9f6af090791c..ee565be91e0cebb071b95493423d30ce88ad340a 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -676,7 +676,7 @@ be_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd)
        status = be_cmd_set_flow_control(adapter,
                                         adapter->tx_fc, adapter->rx_fc);
        if (status)
-               dev_warn(&adapter->pdev->dev, "Pause param set failed.\n");
+               dev_warn(&adapter->pdev->dev, "Pause param set failed\n");
 
        return be_cmd_status(status);
 }

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 5b26c4c9ab2b4fb2b98bb868a611bf5aeffb41a3..f059b62d29b533741338d1340e5b04e12edb93dd 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1093,6 +1093,7 @@ static int be_change_mtu(struct net_device *netdev, int new_mtu)
  */
 static int be_vid_config(struct be_adapter *adapter)
 {
+       struct device *dev = &adapter->pdev->dev;
        u16 vids[BE_NUM_VLANS_SUPPORTED];
        u16 num = 0, i = 0;
        int status = 0;
@@ -1114,16 +1115,15 @@ static int be_vid_config(struct be_adapter *adapter)
                if (addl_status(status) ==
                                MCC_ADDL_STATUS_INSUFFICIENT_RESOURCES)
                        goto set_vlan_promisc;
-               dev_err(&adapter->pdev->dev,
-                       "Setting HW VLAN filtering failed.\n");
+               dev_err(dev, "Setting HW VLAN filtering failed\n");
        } else {
                if (adapter->flags & BE_FLAGS_VLAN_PROMISC) {
                        /* hw VLAN filtering re-enabled. */
                        status = be_cmd_rx_filter(adapter,
                                                  BE_FLAGS_VLAN_PROMISC, OFF);
                        if (!status) {
-                               dev_info(&adapter->pdev->dev,
-                                        "Disabling VLAN Promiscuous mode.\n");
+                               dev_info(dev,
+                                        "Disabling VLAN Promiscuous mode\n");
                                adapter->flags &= ~BE_FLAGS_VLAN_PROMISC;
                        }
                }
@@ -1137,11 +1137,10 @@ set_vlan_promisc:
 
        status = be_cmd_rx_filter(adapter, BE_FLAGS_VLAN_PROMISC, ON);
        if (!status) {
-               dev_info(&adapter->pdev->dev, "Enable VLAN Promiscuous mode\n");
+               dev_info(dev, "Enable VLAN Promiscuous mode\n");
                adapter->flags |= BE_FLAGS_VLAN_PROMISC;
        } else
-               dev_err(&adapter->pdev->dev,
-                       "Failed to enable VLAN Promiscuous mode.\n");
+               dev_err(dev, "Failed to enable VLAN Promiscuous mode\n");
        return status;
 }
 
@@ -3387,7 +3386,7 @@ static int be_get_sriov_config(struct be_adapter *adapter)
 
        if (!be_max_vfs(adapter)) {
                if (num_vfs)
-                       dev_warn(dev, "device doesn't support SRIOV\n");
+                       dev_warn(dev, "SRIOV is disabled. Ignoring num_vfs\n");
                adapter->num_vfs = 0;
                return 0;
        }
@@ -3661,7 +3660,7 @@ static int be_setup(struct be_adapter *adapter)
        dev_info(dev, "FW version is %s\n", adapter->fw_ver);
 
        if (BE2_chip(adapter) && fw_major_num(adapter->fw_ver) < 4) {
-               dev_err(dev, "Firmware on card is old(%s), IRQs may not work.",
+               dev_err(dev, "Firmware on card is old(%s), IRQs may not work",
                        adapter->fw_ver);
                dev_err(dev, "Please upgrade firmware to version >= 4.0\n");
        }