Skip to content

plugin/wdc: Fix UUID search for SN640 and SN655 #2982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igaw merged 1 commit into from
Nov 27, 2025
Merged

plugin/wdc: Fix UUID search for SN640 and SN655 #2982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions plugins/wdc/wdc-nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 ||
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/wdc/wdc-nvme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down