plugin/wdc: Fix UUID search for SN640 and SN655

The current code is checking both the pci device id and UUID.
The pci device id check is not required and causes this check
to fail in nvme over fabrics cases so it was removed.

Signed-off-by: jeff-lien-sndk <[email protected]>

Reviewed-by: brandon-paupore-sndk <[email protected]>

Author: jeff-lien-sndk

plugins/wdc/wdc-nvme.c

@@ -1582,14 +1582,6 @@ static bool wdc_is_sn640(__u32 device_id)
 		return false;
 }
 
-static bool wdc_is_sn640_3(__u32 device_id)
-{
-	if (device_id == WDC_NVME_SN640_DEV_ID_3)
-		return true;
-	else
-		return false;
-}
-
 static bool wdc_is_sn650_u2(__u32 device_id)
 {
 	if (device_id == WDC_NVME_SN650_DEV_ID_3)
@@ -1606,14 +1598,6 @@ static bool wdc_is_sn650_e1l(__u32 device_id)
 		return false;
 }
 
-static bool wdc_is_sn655(__u32 device_id)
-{
-	if (device_id == WDC_NVME_SN655_DEV_ID)
-		return true;
-	else
-		return false;
-}
-
 static bool wdc_is_zn350(__u32 device_id)
 {
 	return (device_id == WDC_NVME_ZN350_DEV_ID ||
@@ -2757,8 +2741,7 @@ static bool get_dev_mgment_data(struct nvme_global_ctx *ctx, struct nvme_transpo
 			 * check for the WDC UUID second.
 			 */
 			uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID);
-			if (uuid_index < 0 &&
-				(wdc_is_sn640_3(device_id) || wdc_is_sn655(device_id)))
+			if (uuid_index < 0)
 				uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID_SN640_3);
 		}
 
@@ -2827,8 +2810,7 @@ static bool get_dev_mgment_cbs_data(struct nvme_global_ctx *ctx, struct nvme_tra
 			 * check for the WDC UUID second.
 			 */
 			uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID);
-			if (uuid_index < 0 &&
-				(wdc_is_sn640_3(device_id) || wdc_is_sn655(device_id)))
+			if (uuid_index < 0)
 				uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID_SN640_3);
 		}
 

plugins/wdc/wdc-nvme.h

@@ -5,7 +5,7 @@
 #if !defined(WDC_NVME) || defined(CMD_HEADER_MULTI_READ)
 #define WDC_NVME
 
-#define WDC_PLUGIN_VERSION   "2.14.6"
+#define WDC_PLUGIN_VERSION   "2.14.7"
 #include "cmd.h"
 
 PLUGIN(NAME("wdc", "Western Digital vendor specific extensions", WDC_PLUGIN_VERSION),