Messages in this thread | | | Date | Sat, 2 Jul 2022 08:07:06 +0200 | Subject | Re: [PATCH v3 1/6] Staging: rtl8192e: Refactored rtllib_modes | From | Philipp Hortmann <> |
| |
On 7/1/22 11:24, Felix Schlepper wrote: > The initial reason for looking at this code was an > issue raised by checkpatch.pl: > > $ ./scripts/checkpatch.pl --terse -f drivers/staging/rtl8192e/rtllib_wx.c > CHECK: Please use a blank line after function/struct/union/enum > declarations > > The additional blank line above the struct/before the headers is > just cleaner. > > However, as it turns out since there is no str formatting required > One can replace the error prone str + size struct with a char array. > The rest of this patch fixes the usecases. > > Signed-off-by: Felix Schlepper <f3sch.git@outlook.com> > --- > drivers/staging/rtl8192e/rtllib_wx.c | 21 ++++++--------------- > 1 file changed, 6 insertions(+), 15 deletions(-) > > diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c > index cf9a240924f2..b7f19b38b0e1 100644 > --- a/drivers/staging/rtl8192e/rtllib_wx.c > +++ b/drivers/staging/rtl8192e/rtllib_wx.c > @@ -17,17 +17,9 @@ > #include <linux/module.h> > #include <linux/etherdevice.h> > #include "rtllib.h" > -struct modes_unit { > - char *mode_string; > - int mode_size; > -}; > -static struct modes_unit rtllib_modes[] = { > - {"a", 1}, > - {"b", 1}, > - {"g", 1}, > - {"?", 1}, > - {"N-24G", 5}, > - {"N-5G", 4}, > + > +static const char * const rtllib_modes[] = { > + "a", "b", "g", "?", "N-24G", "N-5G" > }; > > #define MAX_CUSTOM_LEN 64 > @@ -72,10 +64,9 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, > /* Add the protocol name */ > iwe.cmd = SIOCGIWNAME; > for (i = 0; i < ARRAY_SIZE(rtllib_modes); i++) { > - if (network->mode&(1<<i)) { > - sprintf(pname, rtllib_modes[i].mode_string, > - rtllib_modes[i].mode_size); > - pname += rtllib_modes[i].mode_size; > + if (network->mode & BIT(i)) { > + strcpy(pname, rtllib_modes[i]); > + pname += strlen(rtllib_modes[i]); > } > } > *pname = '\0';
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
| |