nvme: identify primary ctrl do not accept nsid

The identify primary ctrl command do not accept the namespace argument.
Thus remove it.

While at it, also update identify secondary ctrl function to use same
argument name.

Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/nvme-wrap.c b/nvme-wrap.c
index 9e2d30c1f5a0c52bc69e0817b1d7fb039f86c6b4..1327c86d56f741de8d4dd03f1d12efab269ca275 100644 (file)
--- a/nvme-wrap.c
+++ b/nvme-wrap.c
@@ -100,17 +100,16 @@ int nvme_cli_identify_allocated_ns_list(struct nvme_dev *dev, __u32 nsid,
        return do_admin_op(identify_allocated_ns_list, dev, nsid, list);
 }
 
-int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u32 nsid,
+int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u16 cntid,
                                   struct nvme_primary_ctrl_cap *cap)
 {
-       return do_admin_op(identify_primary_ctrl, dev, nsid, cap);
+       return do_admin_op(identify_primary_ctrl, dev, cntid, cap);
 }
 
-int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev,
-                                         __u16 ctrl_id,
+int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev, __u16 cntid,
                                          struct nvme_secondary_ctrl_list *sc_list)
 {
-       return do_admin_op(identify_secondary_ctrl_list, dev, ctrl_id,
+       return do_admin_op(identify_secondary_ctrl_list, dev, cntid,
                           sc_list);
 }
 

diff --git a/nvme-wrap.h b/nvme-wrap.h
index 7fcaad964220badd274d0c5e231bf078038ea2a3..c3bb09a670fbfa26748b58036b9dd245ce33a31b 100644 (file)
--- a/nvme-wrap.h
+++ b/nvme-wrap.h
@@ -26,10 +26,9 @@ int nvme_cli_identify_active_ns_list(struct nvme_dev *dev, __u32 nsid,
                                     struct nvme_ns_list *list);
 int nvme_cli_identify_allocated_ns_list(struct nvme_dev *dev, __u32 nsid,
                                        struct nvme_ns_list *list);
-int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u32 nsid,
+int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u16 cntid,
                                   struct nvme_primary_ctrl_cap *cap);
-int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev,
-                                         __u16 ctrl_id,
+int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev, __u16 cntid,
                                          struct nvme_secondary_ctrl_list *sc_list);
 int nvme_cli_ns_mgmt_delete(struct nvme_dev *dev, __u32 nsid);
 int nvme_cli_ns_mgmt_create(struct nvme_dev *dev,