From: Hannes Reinecke <hare@suse.de>
Date: Fri, 7 May 2021 15:13:22 +0000 (+0200)
Subject: tree: rename nvme_disconnect_ctrl()
X-Git-Tag: v1.0-rc0~124^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=52bd7bd29b48388b54b831b4a70607320c058c36;p=users%2Fsagi%2Flibnvme.git

tree: rename nvme_disconnect_ctrl()

Rename nvme_ctrl_disconnect() to nvme_disconnect_ctrl() to avoid
name clash with SWIG generated interface files.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---

diff --git a/examples/discover-loop.c b/examples/discover-loop.c
index e31e5405..599edd20 100644
--- a/examples/discover-loop.c
+++ b/examples/discover-loop.c
@@ -75,7 +75,7 @@ int main()
 	}
 
 	ret = nvmf_get_discovery_log(c, &log, 4);
-	nvme_ctrl_disconnect(c);
+	nvme_disconnect_ctrl(c);
 	nvme_free_ctrl(c);
 
 	if (ret)
diff --git a/src/nvme/tree.c b/src/nvme/tree.c
index bb24465d..e118be52 100644
--- a/src/nvme/tree.c
+++ b/src/nvme/tree.c
@@ -687,7 +687,7 @@ nvme_path_t nvme_ctrl_next_path(nvme_ctrl_t c, nvme_path_t p)
 
 #define FREE_CTRL_ATTR(a) \
 	do { if (a) { free(a); (a) = NULL; } } while (0)
-int nvme_ctrl_disconnect(nvme_ctrl_t c)
+int nvme_disconnect_ctrl(nvme_ctrl_t c)
 {
 	int ret;
 
diff --git a/src/nvme/tree.h b/src/nvme/tree.h
index ac45e393..c19b1138 100644
--- a/src/nvme/tree.h
+++ b/src/nvme/tree.h
@@ -856,12 +856,12 @@ void nvme_ctrl_disable_sqflow(nvme_ctrl_t c, bool disable_sqflow);
 int nvme_ctrl_identify(nvme_ctrl_t c, struct nvme_id_ctrl *id);
 
 /**
- * nvme_ctrl_disconnect() -
+ * nvme_disconnect_ctrl() -
  * @c:
  *
  * Return: 
  */
-int nvme_ctrl_disconnect(nvme_ctrl_t c);
+int nvme_disconnect_ctrl(nvme_ctrl_t c);
 
 /**
  * nvme_scan_ctrl() -