@@ -1576,6 +1576,12 @@ static bool wdc_is_sn650_e1l(__u32 device_id)
15761576 return false;
15771577}
15781578
1579+ static bool wdc_is_zn350 (__u32 device_id )
1580+ {
1581+ return (device_id == WDC_NVME_ZN350_DEV_ID ||
1582+ device_id == WDC_NVME_ZN350_DEV_ID_1 );
1583+ }
1584+
15791585static bool needs_c2_log_page_check (__u32 device_id )
15801586{
15811587 if ((wdc_is_sn640 (device_id )) ||
@@ -2734,7 +2740,7 @@ static bool get_dev_mgment_cbs_data(nvme_root_t r, struct nvme_dev *dev,
27342740 (int * )& uuid_index ) &&
27352741 wdc_is_sn640_3 (device_id ))) {
27362742 found = get_dev_mgmt_log_page_lid_data (dev , cbs_data , lid , log_id , uuid_index );
2737- } else if (device_id == WDC_NVME_ZN350_DEV_ID || device_id == WDC_NVME_ZN350_DEV_ID_1 ) {
2743+ } else if (wdc_is_zn350 ( device_id ) ) {
27382744 uuid_index = 0 ;
27392745 found = get_dev_mgmt_log_page_lid_data (dev , cbs_data , lid , log_id , uuid_index );
27402746 } else {
@@ -10815,8 +10821,7 @@ static int wdc_log_page_directory(int argc, char **argv, struct command *command
1081510821
1081610822
1081710823 ret = wdc_get_pci_ids (r , dev , & device_id , & read_vendor_id );
10818- log_id = (device_id == WDC_NVME_ZN350_DEV_ID ||
10819- device_id == WDC_NVME_ZN350_DEV_ID_1 ) ?
10824+ log_id = wdc_is_zn350 (device_id ) ?
1082010825 WDC_NVME_GET_DEV_MGMNT_LOG_PAGE_ID_C8 :
1082110826 WDC_NVME_GET_DEV_MGMNT_LOG_PAGE_ID ;
1082210827
0 commit comments