From b78600a3459ea523718976802c51dcfe6c27899c Mon Sep 17 00:00:00 2001 From: Tokunori Ikegami Date: Mon, 5 Feb 2024 00:38:46 +0900 Subject: [PATCH] nvme-print: Move nvme_is_fabrics_reg() to nvme-print.c from nvme.c The function used in nvme-print.c and nvme-print-stdout.c not in nvme.c. Signed-off-by: Tokunori Ikegami --- nvme-print.c | 17 +++++++++++++++++ nvme-print.h | 1 + nvme.c | 17 ----------------- nvme.h | 1 - 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nvme-print.c b/nvme-print.c index b7b75e0eb1..47dc67ce25 100644 --- a/nvme-print.c +++ b/nvme-print.c @@ -374,6 +374,23 @@ const char *nvme_register_pmr_pmrszu_to_string(__u8 pmrszu) return nvme_register_unit_to_string(pmrszu); } +bool nvme_is_fabrics_reg(int offset) +{ + switch (offset) { + case NVME_REG_CAP: + case NVME_REG_VS: + case NVME_REG_CC: + case NVME_REG_CSTS: + case NVME_REG_NSSR: + case NVME_REG_CRTO: + return true; + default: + break; + } + + return false; +} + void nvme_show_ctrl_register(void *bar, bool fabrics, int offset, enum nvme_print_flags flags) { uint64_t value; diff --git a/nvme-print.h b/nvme-print.h index a40fad77ac..c503ca798f 100644 --- a/nvme-print.h +++ b/nvme-print.h @@ -314,4 +314,5 @@ void nvme_show_perror(const char *msg); void nvme_show_error_status(int status, const char *msg, ...); void nvme_show_init(void); void nvme_show_finish(void); +bool nvme_is_fabrics_reg(int offset); #endif /* NVME_PRINT_H */ diff --git a/nvme.c b/nvme.c index abcf0d7c26..50c1bd3a9e 100644 --- a/nvme.c +++ b/nvme.c @@ -5391,23 +5391,6 @@ static int show_registers(int argc, char **argv, struct command *cmd, struct plu return err; } -bool nvme_is_fabrics_reg(int offset) -{ - switch (offset) { - case NVME_REG_CAP: - case NVME_REG_VS: - case NVME_REG_CC: - case NVME_REG_CSTS: - case NVME_REG_NSSR: - case NVME_REG_CRTO: - return true; - default: - break; - } - - return false; -} - static int get_register_property(int fd, void **pbar, int offset) { int err; diff --git a/nvme.h b/nvme.h index a023333f35..366a3de976 100644 --- a/nvme.h +++ b/nvme.h @@ -126,7 +126,6 @@ unsigned long long elapsed_utime(struct timeval start_time, /* nvme-print.c */ const char *nvme_select_to_string(int sel); -bool nvme_is_fabrics_reg(int offset); void d(unsigned char *buf, int len, int width, int group); void d_raw(unsigned char *buf, unsigned len);