| Message ID | 20211115065826.5221-1-hanyihao@vivo.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 311107bdecd158870ab8556fd1289a56a6087bad |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: fddi: use swap() to make code cleaner | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Sun, 14 Nov 2021 22:58:16 -0800 you wrote: > Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid > opencoding it. > > Signed-off-by: Yihao Han <hanyihao@vivo.com> > --- > drivers/net/fddi/skfp/smt.c | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) Here is the summary with links: - net: fddi: use swap() to make code cleaner https://git.kernel.org/netdev/net-next/c/311107bdecd1 You are awesome, thank you!
diff --git a/drivers/net/fddi/skfp/smt.c b/drivers/net/fddi/skfp/smt.c index 6b68a53f1b38..72c31f0013ad 100644 --- a/drivers/net/fddi/skfp/smt.c +++ b/drivers/net/fddi/skfp/smt.c @@ -1846,10 +1846,10 @@ void smt_swap_para(struct smt_header *sm, int len, int direction) } } + static void smt_string_swap(char *data, const char *format, int len) { const char *open_paren = NULL ; - int x ; while (len > 0 && *format) { switch (*format) { @@ -1876,19 +1876,13 @@ static void smt_string_swap(char *data, const char *format, int len) len-- ; break ; case 's' : - x = data[0] ; - data[0] = data[1] ; - data[1] = x ; + swap(data[0], data[1]) ; data += 2 ; len -= 2 ; break ; case 'l' : - x = data[0] ; - data[0] = data[3] ; - data[3] = x ; - x = data[1] ; - data[1] = data[2] ; - data[2] = x ; + swap(data[0], data[3]) ; + swap(data[1], data[2]) ; data += 4 ; len -= 4 ; break ;
Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid opencoding it. Signed-off-by: Yihao Han <hanyihao@vivo.com> --- drivers/net/fddi/skfp/smt.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)