[PATCH -next] wireless: Clean up some inconsistent indenting

Subsystems: marvell mwifiex wireless driver, the rest

STALE1780d

2 messages, 2 authors, 2021-12-02 · open the first message on its own page

[PATCH -next] wireless: Clean up some inconsistent indenting

From: Yang Li <hidden>
Date: 2021-12-02 03:04:30 

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 <redacted>
Signed-off-by: Yang Li <redacted>
---
 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;
 			}
 		}
 		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;
-- 
1.8.3.1

Re: [PATCH -next] wireless: Clean up some inconsistent indenting

From: Brian Norris <briannorris@chromium.org>
Date: 2021-12-02 17:38:01 

Hi,

On Wed, Dec 1, 2021 at 7:04 PM Yang Li [off-list ref] 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.
quoted hunk
Reported-by: Abaci Robot <redacted>
Signed-off-by: Yang Li <redacted>
---
 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.
quoted hunk
                        }
                }
                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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help