mi: be consistent with mi function prefixes

jk-ozlabs · jk-ozlabs · commit e0c2cd5ced09 · 2022-06-20T15:55:17.000+08:00
We should be using nvme_mi_admin_* for the admin channel functions;
rename nvme_mi_identify_{ctrl,ctrl_list} accordingly.

Signed-off-by: Jeremy Kerr &lt;jk@codeconstruct.com.au&gt;
diff --git a/src/nvme/mi.h b/src/nvme/mi.h
@@ -155,15 +155,16 @@ static inline int nvme_mi_admin_identify_cns_nsid(nvme_mi_ctrl_t ctrl,
 	return nvme_mi_admin_identify(ctrl, &args);
 }
 
-static inline int nvme_mi_identify_ctrl(nvme_mi_ctrl_t ctrl,
-					struct nvme_id_ctrl *id)
+static inline int nvme_mi_admin_identify_ctrl(nvme_mi_ctrl_t ctrl,
+					      struct nvme_id_ctrl *id)
 {
 	return nvme_mi_admin_identify_cns_nsid(ctrl, NVME_IDENTIFY_CNS_CTRL,
 					       NVME_NSID_NONE, id);
 }
 
-static inline int nvme_mi_identify_ctrl_list(nvme_mi_ctrl_t ctrl, __u16 cntid,
-					     struct nvme_ctrl_list *list)
+static inline int nvme_mi_admin_identify_ctrl_list(nvme_mi_ctrl_t ctrl,
+						   __u16 cntid,
+						   struct nvme_ctrl_list *list)
 {
 	struct nvme_identify_args args = {
 		.result = NULL,

Original file line number	Diff line number	Diff line change
`@@ -155,15 +155,16 @@ static inline int nvme_mi_admin_identify_cns_nsid(nvme_mi_ctrl_t ctrl,`
`155`	`155`	`return nvme_mi_admin_identify(ctrl, &args);`
`156`	`156`	`}`
`157`	`157`
`158`		`-static inline int nvme_mi_identify_ctrl(nvme_mi_ctrl_t ctrl,`
`159`		`- struct nvme_id_ctrl *id)`
	`158`	`+static inline int nvme_mi_admin_identify_ctrl(nvme_mi_ctrl_t ctrl,`
	`159`	`+ struct nvme_id_ctrl *id)`
`160`	`160`	`{`
`161`	`161`	`return nvme_mi_admin_identify_cns_nsid(ctrl, NVME_IDENTIFY_CNS_CTRL,`
`162`	`162`	`NVME_NSID_NONE, id);`
`163`	`163`	`}`
`164`	`164`
`165`		`-static inline int nvme_mi_identify_ctrl_list(nvme_mi_ctrl_t ctrl, __u16 cntid,`
`166`		`- struct nvme_ctrl_list *list)`
	`165`	`+static inline int nvme_mi_admin_identify_ctrl_list(nvme_mi_ctrl_t ctrl,`
	`166`	`+ __u16 cntid,`
	`167`	`+ struct nvme_ctrl_list *list)`
`167`	`168`	`{`
`168`	`169`	`struct nvme_identify_args args = {`
`169`	`170`	`.result = NULL,`