nvme-print-json: update id-ctrl print code to use libnvme definition

Use libnvme register definitions instead of the shift operator.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

diff --git a/nvme-print-json.c b/nvme-print-json.c
index c11008f65f60f4cea8f0c157924c45bf209c7f17..8cc3f424f11c96ae7271e6e756758b866d783776 100644 (file)
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -450,8 +450,9 @@ void json_nvme_id_ctrl(struct nvme_id_ctrl *ctrl,
                struct json_object *psd = json_create_object();
 
                obj_add_int(psd, "max_power", le16_to_cpu(ctrl->psd[i].mp));
-               obj_add_int(psd, "max_power_scale", ctrl->psd[i].flags & 0x1);
-               obj_add_int(psd, "non-operational_state", (ctrl->psd[i].flags & 2) >> 1);
+               obj_add_int(psd, "max_power_scale", ctrl->psd[i].flags & NVME_PSD_FLAGS_MXPS);
+               obj_add_int(psd, "non-operational_state",
+                           !!(ctrl->psd[i].flags & NVME_PSD_FLAGS_NOPS));
                obj_add_uint(psd, "entry_lat", le32_to_cpu(ctrl->psd[i].enlat));
                obj_add_uint(psd, "exit_lat", le32_to_cpu(ctrl->psd[i].exlat));
                obj_add_int(psd, "read_tput", ctrl->psd[i].rrt);