iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: return string as char *, not unsigned char *

Browse Source 
The functions in drivers/nvme/host/constants.c returning human-readable
status and opcode strings currently use type "const unsigned char *".
Typically string constants use type "const char *",
so remove "unsigned" from the return types.
This is a purely cosmetic change to clarify that the functions
return text strings instead of an array of bytes, for example.

Signed-off-by: Caleb Sander <csander@purestorage.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Keith Busch <kbusch@kernel.org>
This commit is contained in:
Caleb Sander 2024-01-31 09:43:11 -07:00 committed by Keith Busch
parent 0945b43b4e
commit 4b6821940e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/nvme/host/constants.c
View File

@ -171,7 +171,7 @@ static const char * const nvme_statuses[] = {
[NVME_SC_HOST_ABORTED_CMD] = "Host Aborted Command", [NVME_SC_HOST_ABORTED_CMD] = "Host Aborted Command",
}; };
const unsigned char *nvme_get_error_status_str(u16 status) const char *nvme_get_error_status_str(u16 status)
{ {
status &= 0x7ff; status &= 0x7ff;
if (status < ARRAY_SIZE(nvme_statuses) && nvme_statuses[status]) if (status < ARRAY_SIZE(nvme_statuses) && nvme_statuses[status])
@ -179,7 +179,7 @@ const unsigned char *nvme_get_error_status_str(u16 status)
return "Unknown"; return "Unknown";
} }
const unsigned char *nvme_get_opcode_str(u8 opcode) const char *nvme_get_opcode_str(u8 opcode)
{ {
if (opcode < ARRAY_SIZE(nvme_ops) && nvme_ops[opcode]) if (opcode < ARRAY_SIZE(nvme_ops) && nvme_ops[opcode])
return nvme_ops[opcode]; return nvme_ops[opcode];
@ -187,7 +187,7 @@ const unsigned char *nvme_get_opcode_str(u8 opcode)
} }
EXPORT_SYMBOL_GPL(nvme_get_opcode_str); EXPORT_SYMBOL_GPL(nvme_get_opcode_str);
const unsigned char *nvme_get_admin_opcode_str(u8 opcode) const char *nvme_get_admin_opcode_str(u8 opcode)
{ {
if (opcode < ARRAY_SIZE(nvme_admin_ops) && nvme_admin_ops[opcode]) if (opcode < ARRAY_SIZE(nvme_admin_ops) && nvme_admin_ops[opcode])
return nvme_admin_ops[opcode]; return nvme_admin_ops[opcode];
@ -195,7 +195,7 @@ const unsigned char *nvme_get_admin_opcode_str(u8 opcode)
} }
EXPORT_SYMBOL_GPL(nvme_get_admin_opcode_str); EXPORT_SYMBOL_GPL(nvme_get_admin_opcode_str);
const unsigned char *nvme_get_fabrics_opcode_str(u8 opcode) { const char *nvme_get_fabrics_opcode_str(u8 opcode) {
if (opcode < ARRAY_SIZE(nvme_fabrics_ops) && nvme_fabrics_ops[opcode]) if (opcode < ARRAY_SIZE(nvme_fabrics_ops) && nvme_fabrics_ops[opcode])
return nvme_fabrics_ops[opcode]; return nvme_fabrics_ops[opcode];
return "Unknown"; return "Unknown";

18
drivers/nvme/host/nvme.h
View File

@ -1140,31 +1140,31 @@ static inline bool nvme_multi_css(struct nvme_ctrl *ctrl)
} }
#ifdef CONFIG_NVME_VERBOSE_ERRORS #ifdef CONFIG_NVME_VERBOSE_ERRORS
const unsigned char *nvme_get_error_status_str(u16 status); const char *nvme_get_error_status_str(u16 status);
const unsigned char *nvme_get_opcode_str(u8 opcode); const char *nvme_get_opcode_str(u8 opcode);
const unsigned char *nvme_get_admin_opcode_str(u8 opcode); const char *nvme_get_admin_opcode_str(u8 opcode);
const unsigned char *nvme_get_fabrics_opcode_str(u8 opcode); const char *nvme_get_fabrics_opcode_str(u8 opcode);
#else /* CONFIG_NVME_VERBOSE_ERRORS */ #else /* CONFIG_NVME_VERBOSE_ERRORS */
static inline const unsigned char *nvme_get_error_status_str(u16 status) static inline const char *nvme_get_error_status_str(u16 status)
{ {
return "I/O Error"; return "I/O Error";
} }
static inline const unsigned char *nvme_get_opcode_str(u8 opcode) static inline const char *nvme_get_opcode_str(u8 opcode)
{ {
return "I/O Cmd"; return "I/O Cmd";
} }
static inline const unsigned char *nvme_get_admin_opcode_str(u8 opcode) static inline const char *nvme_get_admin_opcode_str(u8 opcode)
{ {
return "Admin Cmd"; return "Admin Cmd";
} }
static inline const unsigned char *nvme_get_fabrics_opcode_str(u8 opcode) static inline const char *nvme_get_fabrics_opcode_str(u8 opcode)
{ {
return "Fabrics Cmd"; return "Fabrics Cmd";
} }
#endif /* CONFIG_NVME_VERBOSE_ERRORS */ #endif /* CONFIG_NVME_VERBOSE_ERRORS */
static inline const unsigned char *nvme_opcode_str(int qid, u8 opcode, u8 fctype) static inline const char *nvme_opcode_str(int qid, u8 opcode, u8 fctype)
{ {
if (opcode == nvme_fabrics_command) if (opcode == nvme_fabrics_command)
return nvme_get_fabrics_opcode_str(fctype); return nvme_get_fabrics_opcode_str(fctype);