From: Felix Schlepper <f3sch.git@outlook.com>
To: gregkh@linuxfoundation.org
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
wjsota@gmail.com, Felix Schlepper <f3sch.git@outlook.com>
Subject: [PATCH v3 1/6] Staging: rtl8192e: Refactored rtllib_modes
Date: Fri, 1 Jul 2022 11:24:49 +0200 [thread overview]
Message-ID: <4dbc4939e88a2c94f1819b4b0cc2c81dc332710b.1656667089.git.f3sch.git@outlook.com> (raw)
In-Reply-To: <cover.1656667089.git.f3sch.git@outlook.com>
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';
--
2.36.1
next prev parent reply other threads:[~2022-07-01 9:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 9:24 [PATCH v3 0/6] Staging: rtl8192e: rtllib_wx Felix Schlepper
2022-07-01 9:24 ` Felix Schlepper [this message]
2022-07-02 6:07 ` [PATCH v3 1/6] Staging: rtl8192e: Refactored rtllib_modes Philipp Hortmann
2022-07-01 9:24 ` [PATCH v3 2/6] Staging: rtl8192e: Avoid multiple assignments Felix Schlepper
2022-07-02 6:08 ` Philipp Hortmann
2022-07-01 9:24 ` [PATCH v3 3/6] Staging: rtl8192e: Remove unnecessary parentheses Felix Schlepper
2022-07-02 6:09 ` Philipp Hortmann
2022-07-01 9:24 ` [PATCH v3 4/6] Staging: rtl8192e: Added braces around else Felix Schlepper
2022-07-02 6:10 ` Philipp Hortmann
2022-07-01 9:24 ` [PATCH v3 5/6] Staging: rtl8192e: Remove unnecessary blank line Felix Schlepper
2022-07-02 6:11 ` Philipp Hortmann
2022-07-01 9:24 ` [PATCH v3 6/6] Staging: rtl8192e: Added spaces around '+' Felix Schlepper
2022-07-02 6:11 ` Philipp Hortmann
2022-07-02 6:17 ` [PATCH v3 0/6] Staging: rtl8192e: rtllib_wx Philipp Hortmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4dbc4939e88a2c94f1819b4b0cc2c81dc332710b.1656667089.git.f3sch.git@outlook.com \
--to=f3sch.git@outlook.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=wjsota@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).