infiniband: hf1: Use string_upper() instead of open coded variant
Subsystems (3)
PATCH v2 1/1 infiniband: hf1: Use string_upper() instead of open coded variant
Use string_upper() from string helper module instead of open coded variant.
---
v2: fixed compilation error (Jason)
drivers/infiniband/hw/hfi1/efivar.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/infiniband/hw/hfi1/efivar.c +4 -6
@@ -3,7 +3,9 @@* Copyright(c) 2015, 2016 Intel Corporation. */ -#include <linux/ctype.h> +#include <linux/string.h> +#include <linux/string_helpers.h> +#include "efivar.h" /* GUID for HFI1 variables in EFI */
@@ -112,7 +114,6 @@ int read_hfi1_efi_var(struct hfi1_devdata *dd, const char *kind,char prefix_name[64 ];char name[64 ];int result; -int i;/* create a common prefix */ snprintf(prefix_name, sizeof(prefix_name), "%04x:%02x:%02x.%x",
@@ -128,10 +129,7 @@ int read_hfi1_efi_var(struct hfi1_devdata *dd, const char *kind,* variable. */ if (result) { -/* Converting to uppercase */ -for (i =0 ; prefix_name[i]; i++) -if (isalpha (prefix_name[i])) - prefix_name[i] =toupper (prefix_name[i]); +string_upper (prefix_name, prefix_name);snprintf (name,sizeof (name),"%s-%s" , prefix_name, kind); result =read_efi_var (name, size, return_data); }
Signature · 1 line
2.33.0
Quoted 1 line · Andy Shevchenko
Use
string_upper()from string helper module instead of open coded variant.
Perhaps these string_upper and string_lower utility functions should return dst not void so these functions could be used in output calls.
So instead of:
+ string_upper(prefix_name, prefix_name);
snprintf(name, sizeof(name), "%s-%s", prefix_name, kind);
this could be consolidated:
snprintf(name, sizeof(name), "%s-%s", string_upper(prefix_name), kind);
Perhaps:
--- include/linux/string_helpers.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
include/linux/string_helpers.h +10 -2
@@ -81,18 +81,26 @@ static inline int string_escape_str_any_np(const char *src, char *dst,return string_escape_str (src, dst, sz,ESCAPE_ANY_NP , only); } -static inline void string_upper (char *dst,const char *src) +static inline char *string_upper (char *dst,const char *src) { +char *rtn = dst; +do { *dst++ =toupper (*src); }while (*src++); + +return rtn; } -static inline void string_lower (char *dst,const char *src) +static inline char *string_lower (char *dst,const char *src) { +char *rtn = dst; +do { *dst++ =tolower (*src); }while (*src++); + +return rtn; }char *kstrdup_quotable (const char *src,gfp_t gfp);
Quoted 6 lines · Joe Perches
Quoted 1 line · Andy Shevchenko
Use
string_upper()from string helper module instead of open coded variant.Perhaps these
string_upperandstring_lowerutility functions should return dst not void so these functions could be used in output calls.
Perhaps.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 7 lines · Andy Shevchenko
Use
string_upper()from string helper module instead of open coded variant.Signed-off-by Andy Shevchenko <[email protected]>---
v2: fixed compilation error (Jason)drivers/infiniband/hw/hfi1/efivar.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
Applied to for-next, thanks
Jason