From: Tokunori Ikegami <ikegami.t@gmail.com>
Date: Wed, 2 Aug 2023 15:21:06 +0000 (+0900)
Subject: nvme-rpmb: Fix nvme_show_id_ctrl_rpmbs() definition error
X-Git-Tag: v2.6~60
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3b4294746ca1430039843da2d22b8eb0cedbbbbb;p=users%2Fsagi%2Fnvme-cli.git

nvme-rpmb: Fix nvme_show_id_ctrl_rpmbs() definition error

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

diff --git a/nvme-print.h b/nvme-print.h
index 638a2b6f..c32397cf 100644
--- a/nvme-print.h
+++ b/nvme-print.h
@@ -116,6 +116,7 @@ void nvme_show_relatives(const char *name);
 void nvme_show_id_iocs(struct nvme_id_iocs *iocs, enum nvme_print_flags flags);
 void nvme_show_id_ctrl(struct nvme_id_ctrl *ctrl, enum nvme_print_flags flags,
 	void (*vendor_show)(__u8 *vs, struct json_object *root));
+void nvme_show_id_ctrl_rpmbs(__le32 ctrl_rpmbs, enum nvme_print_flags flags);
 void nvme_show_id_ns(struct nvme_id_ns *ns, unsigned int nsid,
 		unsigned int lba_index, bool cap_only, enum nvme_print_flags flags);
 void nvme_show_cmd_set_independent_id_ns(
diff --git a/nvme-rpmb.c b/nvme-rpmb.c
index 40ddb5b2..3dbbbd38 100644
--- a/nvme-rpmb.c
+++ b/nvme-rpmb.c
@@ -32,6 +32,7 @@
 #include "common.h"
 #include "nvme.h"
 #include "libnvme.h"
+#include "nvme-print.h"
 
 #define CREATE_CMD
 
@@ -48,7 +49,6 @@
 #define HMAC_SHA256_HASH_SIZE		32
 #define MD5_HASH_HASH_SIZE		16
 
-extern int nvme_show_id_ctrl_rpmbs(unsigned int);
 /*
  * Utility function to create hash value of given data (with given key) using
  * given hash algorithm; this function uses kernel crypto services
@@ -903,7 +903,7 @@ int rpmb_cmd_option(int argc, char **argv, struct command *cmd, struct plugin *p
 	
 	/* parse and validate options; default print rpmb support info */
 	if (cfg.cmd == 0 || strcmp(cfg.cmd, "info") == 0) {
-		nvme_show_id_ctrl_rpmbs(regs.rpmbs);
+		nvme_show_id_ctrl_rpmbs(regs.rpmbs, 0);
 		goto out;
 	}