diff mbox series

[-next] wireless: Clean up some inconsistent indenting

Message ID 1638414076-53227-1-git-send-email-yang.lee@linux.alibaba.com
State New
Headers show
Series [-next] wireless: Clean up some inconsistent indenting | expand

Commit Message

Yang Li Dec. 2, 2021, 3:01 a.m. UTC
Eliminate the follow smatch warnings:

drivers/net/wireless/marvell/mwifiex/pcie.c:3376
mwifiex_unregister_dev() warn: inconsistent indenting
drivers/net/wireless/marvell/mwifiex/uap_event.c:285
mwifiex_process_uap_event() warn: inconsistent indenting
drivers/net/wireless/marvell/mwifiex/sta_event.c:797
mwifiex_process_sta_event() warn: inconsistent indenting

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 drivers/net/wireless/marvell/mwifiex/pcie.c      | 2 +-
 drivers/net/wireless/marvell/mwifiex/sta_event.c | 2 +-
 drivers/net/wireless/marvell/mwifiex/uap_event.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Brian Norris Dec. 2, 2021, 5:37 p.m. UTC | #1
Hi,

On Wed, Dec 1, 2021 at 7:04 PM Yang Li <yang.lee@linux.alibaba.com> wrote:
>
> Eliminate the follow smatch warnings:
>
> drivers/net/wireless/marvell/mwifiex/pcie.c:3376
> mwifiex_unregister_dev() warn: inconsistent indenting
> drivers/net/wireless/marvell/mwifiex/uap_event.c:285
> mwifiex_process_uap_event() warn: inconsistent indenting
> drivers/net/wireless/marvell/mwifiex/sta_event.c:797
> mwifiex_process_sta_event() warn: inconsistent indenting

Thanks for looking at the smatch warnings! But I think you've taken
the wrong action on two of them. See below.

> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
> ---
>  drivers/net/wireless/marvell/mwifiex/pcie.c      | 2 +-
>  drivers/net/wireless/marvell/mwifiex/sta_event.c | 2 +-
>  drivers/net/wireless/marvell/mwifiex/uap_event.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
> index d5fb294..43bdcbc 100644
> --- a/drivers/net/wireless/marvell/mwifiex/pcie.c
> +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
> @@ -3373,7 +3373,7 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter)
>         } else {
>                 mwifiex_dbg(adapter, INFO,
>                             "%s(): calling free_irq()\n", __func__);
> -              free_irq(card->dev->irq, &card->share_irq_ctx);
> +               free_irq(card->dev->irq, &card->share_irq_ctx);
>
>                 if (card->msi_enable)
>                         pci_disable_msi(pdev);
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c
> index 80e5d44..9a3fbfb 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_event.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c
> @@ -794,7 +794,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
>                                          MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET))
>                                                 adapter->ps_state =
>                                                         PS_STATE_SLEEP;
> -                                       return 0;
> +                               return 0;

Hmm, I have a strong suspicion that the *indentation* was actually
correct, and your stylistic warning actually signals that the braces
are incorrect. See how the assignment to 'ps_state' is clobbered just
a few lines below; I suspect the failure to send a null packet is
supposed to mean we should exit this function immediately, and all
other cases are supposed to continue.

>                         }
>                 }
>                 adapter->ps_state = PS_STATE_AWAKE;
> diff --git a/drivers/net/wireless/marvell/mwifiex/uap_event.c b/drivers/net/wireless/marvell/mwifiex/uap_event.c
> index 2e25d72..e31de7a 100644
> --- a/drivers/net/wireless/marvell/mwifiex/uap_event.c
> +++ b/drivers/net/wireless/marvell/mwifiex/uap_event.c
> @@ -282,7 +282,7 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv)
>                                          MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET))
>                                                 adapter->ps_state =
>                                                         PS_STATE_SLEEP;
> -                                       return 0;
> +                               return 0;

Same here.

Brian

>                         }
>                 }
>                 adapter->ps_state = PS_STATE_AWAKE;
> --
> 1.8.3.1
>
diff mbox series

Patch

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index d5fb294..43bdcbc 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -3373,7 +3373,7 @@  static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter)
 	} else {
 		mwifiex_dbg(adapter, INFO,
 			    "%s(): calling free_irq()\n", __func__);
-	       free_irq(card->dev->irq, &card->share_irq_ctx);
+		free_irq(card->dev->irq, &card->share_irq_ctx);
 
 		if (card->msi_enable)
 			pci_disable_msi(pdev);
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c
index 80e5d44..9a3fbfb 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_event.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c
@@ -794,7 +794,7 @@  int mwifiex_process_sta_event(struct mwifiex_private *priv)
 					 MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET))
 						adapter->ps_state =
 							PS_STATE_SLEEP;
-					return 0;
+				return 0;
 			}
 		}
 		adapter->ps_state = PS_STATE_AWAKE;
diff --git a/drivers/net/wireless/marvell/mwifiex/uap_event.c b/drivers/net/wireless/marvell/mwifiex/uap_event.c
index 2e25d72..e31de7a 100644
--- a/drivers/net/wireless/marvell/mwifiex/uap_event.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_event.c
@@ -282,7 +282,7 @@  int mwifiex_process_uap_event(struct mwifiex_private *priv)
 					 MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET))
 						adapter->ps_state =
 							PS_STATE_SLEEP;
-					return 0;
+				return 0;
 			}
 		}
 		adapter->ps_state = PS_STATE_AWAKE;