| Message ID | 20191209211623.44166-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | net: tulip: Adjust indentation in {dmfe,uli526x}_init_module | expand |
On Mon, Dec 9, 2019 at 1:16 PM Nathan Chancellor <natechancellor@gmail.com> wrote: > > Clang warns: > > ../drivers/net/ethernet/dec/tulip/uli526x.c:1812:3: warning: misleading > indentation; statement is not part of the previous 'if' > [-Wmisleading-indentation] > switch (mode) { > ^ > ../drivers/net/ethernet/dec/tulip/uli526x.c:1809:2: note: previous > statement is here > if (cr6set) > ^ > 1 warning generated. > > ../drivers/net/ethernet/dec/tulip/dmfe.c:2217:3: warning: misleading > indentation; statement is not part of the previous 'if' > [-Wmisleading-indentation] > switch(mode) { > ^ > ../drivers/net/ethernet/dec/tulip/dmfe.c:2214:2: note: previous > statement is here > if (cr6set) > ^ > 1 warning generated. > > This warning occurs because there is a space before the tab on these > lines. Remove them so that the indentation is consistent with the Linux > kernel coding style and clang no longer warns. > > While we are here, adjust the default block in dmfe_init_module to have > a proper break between the label and assignment and add a space between > the switch and opening parentheses to avoid a checkpatch warning. > > Fixes: e1c3e5014040 ("[PATCH] initialisation cleanup for ULI526x-net-driver") > Link: https://github.com/ClangBuiltLinux/linux/issues/795 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> /^ \t in vim turns up a few more cases that I think should be fixed (in both files) > --- > drivers/net/ethernet/dec/tulip/dmfe.c | 7 ++++--- > drivers/net/ethernet/dec/tulip/uli526x.c | 4 ++-- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c > index 0efdbd1a4a6f..32d470d4122a 100644 > --- a/drivers/net/ethernet/dec/tulip/dmfe.c > +++ b/drivers/net/ethernet/dec/tulip/dmfe.c > @@ -2214,15 +2214,16 @@ static int __init dmfe_init_module(void) > if (cr6set) > dmfe_cr6_user_set = cr6set; > > - switch(mode) { > - case DMFE_10MHF: > + switch (mode) { > + case DMFE_10MHF: > case DMFE_100MHF: > case DMFE_10MFD: > case DMFE_100MFD: > case DMFE_1M_HPNA: > dmfe_media_mode = mode; > break; > - default:dmfe_media_mode = DMFE_AUTO; > + default: > + dmfe_media_mode = DMFE_AUTO; > break; > } > > diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c > index b1f30b194300..117ffe08800d 100644 > --- a/drivers/net/ethernet/dec/tulip/uli526x.c > +++ b/drivers/net/ethernet/dec/tulip/uli526x.c > @@ -1809,8 +1809,8 @@ static int __init uli526x_init_module(void) > if (cr6set) > uli526x_cr6_user_set = cr6set; > > - switch (mode) { > - case ULI526X_10MHF: > + switch (mode) { > + case ULI526X_10MHF: > case ULI526X_100MHF: > case ULI526X_10MFD: > case ULI526X_100MFD: > -- > 2.24.0 > > -- > You received this message because you are subscribed to the Google Groups "Clang Built Linux" group. > To unsubscribe from this group and stop receiving emails from it, send an email to clang-built-linux+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20191209211623.44166-1-natechancellor%40gmail.com.
From: Nathan Chancellor <natechancellor@gmail.com> Date: Mon, 9 Dec 2019 14:16:23 -0700 > Clang warns: > > ../drivers/net/ethernet/dec/tulip/uli526x.c:1812:3: warning: misleading > indentation; statement is not part of the previous 'if' > [-Wmisleading-indentation] > switch (mode) { > ^ > ../drivers/net/ethernet/dec/tulip/uli526x.c:1809:2: note: previous > statement is here > if (cr6set) > ^ > 1 warning generated. > > ../drivers/net/ethernet/dec/tulip/dmfe.c:2217:3: warning: misleading > indentation; statement is not part of the previous 'if' > [-Wmisleading-indentation] > switch(mode) { > ^ > ../drivers/net/ethernet/dec/tulip/dmfe.c:2214:2: note: previous > statement is here > if (cr6set) > ^ > 1 warning generated. > > This warning occurs because there is a space before the tab on these > lines. Remove them so that the indentation is consistent with the Linux > kernel coding style and clang no longer warns. > > While we are here, adjust the default block in dmfe_init_module to have > a proper break between the label and assignment and add a space between > the switch and opening parentheses to avoid a checkpatch warning. > > Fixes: e1c3e5014040 ("[PATCH] initialisation cleanup for ULI526x-net-driver") > Link: https://github.com/ClangBuiltLinux/linux/issues/795 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Applied, but it's really crummy that the tool gets tripped up by the fact that a space preceeds the TAB. It's what the code visually looks like, not what exact kinds of SPACE characters were used to get there.
On Mon, Dec 09, 2019 at 08:29:20PM -0800, David Miller wrote: > From: Nathan Chancellor <natechancellor@gmail.com> > Date: Mon, 9 Dec 2019 14:16:23 -0700 > > > Clang warns: > > > > ../drivers/net/ethernet/dec/tulip/uli526x.c:1812:3: warning: misleading > > indentation; statement is not part of the previous 'if' > > [-Wmisleading-indentation] > > switch (mode) { > > ^ > > ../drivers/net/ethernet/dec/tulip/uli526x.c:1809:2: note: previous > > statement is here > > if (cr6set) > > ^ > > 1 warning generated. > > > > ../drivers/net/ethernet/dec/tulip/dmfe.c:2217:3: warning: misleading > > indentation; statement is not part of the previous 'if' > > [-Wmisleading-indentation] > > switch(mode) { > > ^ > > ../drivers/net/ethernet/dec/tulip/dmfe.c:2214:2: note: previous > > statement is here > > if (cr6set) > > ^ > > 1 warning generated. > > > > This warning occurs because there is a space before the tab on these > > lines. Remove them so that the indentation is consistent with the Linux > > kernel coding style and clang no longer warns. > > > > While we are here, adjust the default block in dmfe_init_module to have > > a proper break between the label and assignment and add a space between > > the switch and opening parentheses to avoid a checkpatch warning. > > > > Fixes: e1c3e5014040 ("[PATCH] initialisation cleanup for ULI526x-net-driver") > > Link: https://github.com/ClangBuiltLinux/linux/issues/795 > > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > > Applied, but it's really crummy that the tool gets tripped up by the > fact that a space preceeds the TAB. It's what the code visually looks > like, not what exact kinds of SPACE characters were used to get there. I agree. There is a follow up patch from the author of the warning that claims to alieviate some of these but that is still in discussion and as far as I understand it, it won't fix all of them so I'm just dealing with all of them on the Linux side. https://reviews.llvm.org/D71037 Thanks for picking them up! Nathan
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c index 0efdbd1a4a6f..32d470d4122a 100644 --- a/drivers/net/ethernet/dec/tulip/dmfe.c +++ b/drivers/net/ethernet/dec/tulip/dmfe.c @@ -2214,15 +2214,16 @@ static int __init dmfe_init_module(void) if (cr6set) dmfe_cr6_user_set = cr6set; - switch(mode) { - case DMFE_10MHF: + switch (mode) { + case DMFE_10MHF: case DMFE_100MHF: case DMFE_10MFD: case DMFE_100MFD: case DMFE_1M_HPNA: dmfe_media_mode = mode; break; - default:dmfe_media_mode = DMFE_AUTO; + default: + dmfe_media_mode = DMFE_AUTO; break; } diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c index b1f30b194300..117ffe08800d 100644 --- a/drivers/net/ethernet/dec/tulip/uli526x.c +++ b/drivers/net/ethernet/dec/tulip/uli526x.c @@ -1809,8 +1809,8 @@ static int __init uli526x_init_module(void) if (cr6set) uli526x_cr6_user_set = cr6set; - switch (mode) { - case ULI526X_10MHF: + switch (mode) { + case ULI526X_10MHF: case ULI526X_100MHF: case ULI526X_10MFD: case ULI526X_100MFD:
Clang warns: ../drivers/net/ethernet/dec/tulip/uli526x.c:1812:3: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation] switch (mode) { ^ ../drivers/net/ethernet/dec/tulip/uli526x.c:1809:2: note: previous statement is here if (cr6set) ^ 1 warning generated. ../drivers/net/ethernet/dec/tulip/dmfe.c:2217:3: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation] switch(mode) { ^ ../drivers/net/ethernet/dec/tulip/dmfe.c:2214:2: note: previous statement is here if (cr6set) ^ 1 warning generated. This warning occurs because there is a space before the tab on these lines. Remove them so that the indentation is consistent with the Linux kernel coding style and clang no longer warns. While we are here, adjust the default block in dmfe_init_module to have a proper break between the label and assignment and add a space between the switch and opening parentheses to avoid a checkpatch warning. Fixes: e1c3e5014040 ("[PATCH] initialisation cleanup for ULI526x-net-driver") Link: https://github.com/ClangBuiltLinux/linux/issues/795 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/net/ethernet/dec/tulip/dmfe.c | 7 ++++--- drivers/net/ethernet/dec/tulip/uli526x.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)