From: Ming Lin <ming.l@ssi.samsung.com>
Date: Fri, 8 Apr 2016 06:18:09 +0000 (-0700)
Subject: Rename nvme_log() to nvme_get_log()
X-Git-Tag: v0.7~8^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=09c48daf8d75b85e9c985c42a235e0e85ee95325;p=users%2Fsagi%2Fnvme-cli.git

Rename nvme_log() to nvme_get_log()

This kills off the old nvme_get_log() and rename
nvme_log() to nvme_get_log().

Signed-off-by: Ming Lin <ming.l@ssi.samsung.com>
---

diff --git a/nvme-ioctl.c b/nvme-ioctl.c
index 89ea2b97..849d3b65 100644
--- a/nvme-ioctl.c
+++ b/nvme-ioctl.c
@@ -354,45 +354,40 @@ int nvme_identify_ctrl_list(int fd, __u32 nsid, __u16 cntid, void *data)
 	return nvme_identify(fd, nsid, (cntid << 16) | cns, data);
 }
 
-int nvme_get_log(int fd, __u32 nsid, __u32 cdw10, __u32 data_len, void *data)
+int nvme_get_log(int fd, __u32 nsid, __u8 log_id, __u32 data_len, void *data)
 {
 	struct nvme_admin_cmd cmd = {
 		.opcode		= nvme_admin_get_log_page,
 		.nsid		= nsid,
 		.addr		= (__u64)(uintptr_t) data,
 		.data_len	= data_len,
-		.cdw10		= cdw10,
 	};
-	return nvme_submit_admin_passthru(fd, &cmd);
-}
 
-int nvme_log(int fd, __u32 nsid, __u8 log_id, __u32 data_len, void *data)
-{
-	__u32 cdw10 = log_id | ((data_len >> 2) - 1) << 16;
+	cmd.cdw10 = log_id | ((data_len >> 2) - 1) << 16;
 
-	return nvme_get_log(fd, nsid, cdw10, data_len, data);
+	return nvme_submit_admin_passthru(fd, &cmd);
 }
 
 int nvme_fw_log(int fd, struct nvme_firmware_log_page *fw_log)
 {
-	return nvme_log(fd, 0xffffffff, NVME_LOG_FW_SLOT, sizeof(*fw_log), fw_log);
+	return nvme_get_log(fd, 0xffffffff, NVME_LOG_FW_SLOT, sizeof(*fw_log), fw_log);
 }
 
 int nvme_error_log(int fd, __u32 nsid, int entries,
 		   struct nvme_error_log_page *err_log)
 {
-	return nvme_log(fd, nsid, NVME_LOG_ERROR, entries * sizeof(*err_log), err_log);
+	return nvme_get_log(fd, nsid, NVME_LOG_ERROR, entries * sizeof(*err_log), err_log);
 }
 
 int nvme_smart_log(int fd, __u32 nsid, struct nvme_smart_log *smart_log)
 {
-	return nvme_log(fd, nsid, NVME_LOG_SMART, sizeof(*smart_log), smart_log);
+	return nvme_get_log(fd, nsid, NVME_LOG_SMART, sizeof(*smart_log), smart_log);
 }
 
 int nvme_intel_smart_log(int fd, __u32 nsid,
 			 struct nvme_additional_smart_log *intel_smart_log)
 {
-	return nvme_log(fd, nsid, 0xca, sizeof(*intel_smart_log),
+	return nvme_get_log(fd, nsid, 0xca, sizeof(*intel_smart_log),
 			intel_smart_log);
 }
 
diff --git a/nvme-ioctl.h b/nvme-ioctl.h
index 240f8dd9..77c0bc85 100644
--- a/nvme-ioctl.h
+++ b/nvme-ioctl.h
@@ -76,8 +76,7 @@ int nvme_identify_ns(int fd, __u32 nsid, bool present, void *data);
 int nvme_identify_ns_list(int fd, __u32 nsid, bool all, void *data);
 int nvme_identify_ctrl_list(int fd, __u32 nsid, __u16 cntid, void *data);
 
-int nvme_get_log(int fd, __u32 nsid, __u32 cdw10, __u32 data_len, void *data);
-int nvme_log(int fd, __u32 nsid, __u8 log_id, __u32 data_len, void *data);
+int nvme_get_log(int fd, __u32 nsid, __u8 log_id, __u32 data_len, void *data);
 int nvme_fw_log(int fd, struct nvme_firmware_log_page *fw_log);
 int nvme_error_log(int fd, __u32 nsid, int entries,
 		   struct nvme_error_log_page *err_log);
diff --git a/nvme.c b/nvme.c
index cdfc9744..771bfd57 100644
--- a/nvme.c
+++ b/nvme.c
@@ -395,7 +395,7 @@ static int get_log(int argc, char **argv)
 	} else {
 		unsigned char log[cfg.log_len];
 
-		err = nvme_log(fd, cfg.namespace_id, cfg.log_id, cfg.log_len, log);
+		err = nvme_get_log(fd, cfg.namespace_id, cfg.log_id, cfg.log_len, log);
 		if (!err) {
 			if (!cfg.raw_binary) {
 				printf("Device:%s log-id:%d namespace-id:%#x\n",