qlcnic: qlcnic_get_board_name() function cleanup

Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 28 insertions, 9 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 5b18b0accb06..da82f2eb73b4 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -862,6 +862,27 @@ static int qlcnic_setup_pci_map(struct pci_dev *pdev,
         return 0;
 }
 
+static inline bool qlcnic_validate_subsystem_id(struct qlcnic_adapter *adapter,
+                                                int index)
+{
+        struct pci_dev *pdev = adapter->pdev;
+        unsigned short subsystem_vendor;
+        bool ret = true;
+
+        subsystem_vendor = pdev->subsystem_vendor;
+
+        if (pdev->device == PCI_DEVICE_ID_QLOGIC_QLE824X ||
+            pdev->device == PCI_DEVICE_ID_QLOGIC_QLE834X) {
+                if (qlcnic_boards[index].sub_vendor == subsystem_vendor &&
+                    qlcnic_boards[index].sub_device == pdev->subsystem_device)
+                        ret = true;
+                else
+                        ret = false;
+        }
+
+        return ret;
+}
+
 static void qlcnic_get_board_name(struct qlcnic_adapter *adapter, char *name)
 {
         struct pci_dev *pdev = adapter->pdev;
@@ -869,20 +890,18 @@ static void qlcnic_get_board_name(struct qlcnic_adapter *adapter, char *name)
 
         for (i = 0; i < NUM_SUPPORTED_BOARDS; ++i) {
                 if (qlcnic_boards[i].vendor == pdev->vendor &&
-                        qlcnic_boards[i].device == pdev->device &&
-                        qlcnic_boards[i].sub_vendor == pdev->subsystem_vendor &&
-                        qlcnic_boards[i].sub_device == pdev->subsystem_device) {
-                                sprintf(name, "%pM: %s" ,
-                                        adapter->mac_addr,
-                                        qlcnic_boards[i].short_name);
-                                found = 1;
-                                break;
+                    qlcnic_boards[i].device == pdev->device &&
+                    qlcnic_validate_subsystem_id(adapter, i)) {
+                        found = 1;
+                        break;
                 }
-
         }
 
         if (!found)
                 sprintf(name, "%pM Gigabit Ethernet", adapter->mac_addr);
+        else
+                sprintf(name, "%pM: %s" , adapter->mac_addr,
+                        qlcnic_boards[i].short_name);
 }
 
 static void