Skip to content

Commit 7e3424f

Browse files
wdc: add wdc_is_zn350() wrapper
Add wdc_is_zn350() wrapper to replace repeating open code condition (device_id == WDC_NVME_ZN350_DEV_ID || device_id == WDC_NVME_ZN350_DEV_ID_1) Signed-off-by: Tomas Winkler <[email protected]>
1 parent a6ead8d commit 7e3424f

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

plugins/wdc/wdc-nvme.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,6 +1580,12 @@ static bool wdc_is_sn650_e1l(__u32 device_id)
15801580
return false;
15811581
}
15821582

1583+
static bool wdc_is_zn350(__u32 device_id)
1584+
{
1585+
return (device_id == WDC_NVME_ZN350_DEV_ID ||
1586+
device_id == WDC_NVME_ZN350_DEV_ID_1);
1587+
}
1588+
15831589
static bool needs_c2_log_page_check(__u32 device_id)
15841590
{
15851591
if ((wdc_is_sn640(device_id)) ||
@@ -2774,7 +2780,7 @@ static bool get_dev_mgment_cbs_data(nvme_root_t r, struct nvme_dev *dev,
27742780
if (uuid_present) {
27752781
/* use the uuid index found above */
27762782
found = get_dev_mgmt_log_page_lid_data(dev, cbs_data, lid, log_id, uuid_index);
2777-
} else if (device_id == WDC_NVME_ZN350_DEV_ID || device_id == WDC_NVME_ZN350_DEV_ID_1) {
2783+
} else if (wdc_is_zn350(device_id)) {
27782784
uuid_index = 0;
27792785
found = get_dev_mgmt_log_page_lid_data(dev, cbs_data, lid, log_id, uuid_index);
27802786
} else {
@@ -10775,8 +10781,7 @@ static int wdc_log_page_directory(int argc, char **argv, struct command *command
1077510781

1077610782

1077710783
ret = wdc_get_pci_ids(r, dev, &device_id, &read_vendor_id);
10778-
log_id = (device_id == WDC_NVME_ZN350_DEV_ID ||
10779-
device_id == WDC_NVME_ZN350_DEV_ID_1) ?
10784+
log_id = wdc_is_zn350(device_id) ?
1078010785
WDC_NVME_GET_DEV_MGMNT_LOG_PAGE_ID_C8 :
1078110786
WDC_NVME_GET_DEV_MGMNT_LOG_PAGE_ID;
1078210787

0 commit comments

Comments
 (0)