| From fe06bf3d83ef0d92f35a24e03297172e92ce9ce3 Mon Sep 17 00:00:00 2001 |
| From: Nathan Chancellor <natechancellor@gmail.com> |
| Date: Mon, 9 Dec 2019 14:16:23 -0700 |
| Subject: net: tulip: Adjust indentation in {dmfe, uli526x}_init_module |
| |
| From: Nathan Chancellor <natechancellor@gmail.com> |
| |
| commit fe06bf3d83ef0d92f35a24e03297172e92ce9ce3 upstream. |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/ethernet/dec/tulip/dmfe.c | 7 ++++--- |
| drivers/net/ethernet/dec/tulip/uli526x.c | 4 ++-- |
| 2 files changed, 6 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/net/ethernet/dec/tulip/dmfe.c |
| +++ b/drivers/net/ethernet/dec/tulip/dmfe.c |
| @@ -2222,15 +2222,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; |
| } |
| |
| --- a/drivers/net/ethernet/dec/tulip/uli526x.c |
| +++ b/drivers/net/ethernet/dec/tulip/uli526x.c |
| @@ -1817,8 +1817,8 @@ static int __init uli526x_init_module(vo |
| 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: |