| Message ID | 20231110083327.7022-1-jiapeng.chong@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | mwifiex: clean up some inconsistent indenting | expand |
On Fri, 2023-11-10 at 16:33 +0800, Jiapeng Chong wrote: > No functional modification involved. > > drivers/net/wireless/marvell/mwifiex/sta_event.c:789 mwifiex_process_sta_event() warn: inconsistent indenting. OK, sure ... > +++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c > @@ -762,7 +762,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) > mwifiex_dbg(adapter, EVENT, "info: EVENT: AWAKE\n"); > if (!adapter->pps_uapsd_mode && > (priv->port_open || > - (priv->bss_mode == NL80211_IFTYPE_ADHOC)) && > + (priv->bss_mode == NL80211_IFTYPE_ADHOC)) && > priv->media_connected && adapter->sleep_period.period) { > adapter->pps_uapsd_mode = true; > mwifiex_dbg(adapter, EVENT, > @@ -773,7 +773,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) > if (mwifiex_check_last_packet_indication(priv)) { > if (adapter->data_sent || > (adapter->if_ops.is_port_ready && > - !adapter->if_ops.is_port_ready(priv))) { > + !adapter->if_ops.is_port_ready(priv))) { > adapter->ps_state = PS_STATE_AWAKE; > adapter->pm_wakeup_card_req = false; > adapter->pm_wakeup_fw_try = false; Seems fine. > @@ -781,12 +781,10 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) > break; > } > if (!mwifiex_send_null_packet > - (priv, > - MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET | > - MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET)) > - adapter->ps_state = > - PS_STATE_SLEEP; > - return 0; > + (priv, MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET | > + MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET)) > + adapter->ps_state = PS_STATE_SLEEP; > + return 0; >
On 11/10/2023 12:33 AM, Jiapeng Chong wrote: > No functional modification involved. > > drivers/net/wireless/marvell/mwifiex/sta_event.c:789 mwifiex_process_sta_event() warn: inconsistent indenting. > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7226 > Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> > --- > drivers/net/wireless/marvell/mwifiex/sta_event.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c > index df9cdd10a494..9dd3b6d71026 100644 > --- a/drivers/net/wireless/marvell/mwifiex/sta_event.c > +++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c > @@ -762,7 +762,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) > mwifiex_dbg(adapter, EVENT, "info: EVENT: AWAKE\n"); > if (!adapter->pps_uapsd_mode && > (priv->port_open || > - (priv->bss_mode == NL80211_IFTYPE_ADHOC)) && > + (priv->bss_mode == NL80211_IFTYPE_ADHOC)) && this change looks incorrect to me this condition is *inside* the parenthesis from the beginning of the previous line, and hence this should align after that parenthesis, not with that parenthesis, which is what the existing code is doing > priv->media_connected && adapter->sleep_period.period) { > adapter->pps_uapsd_mode = true; > mwifiex_dbg(adapter, EVENT, > @@ -773,7 +773,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) > if (mwifiex_check_last_packet_indication(priv)) { > if (adapter->data_sent || > (adapter->if_ops.is_port_ready && > - !adapter->if_ops.is_port_ready(priv))) { > + !adapter->if_ops.is_port_ready(priv))) { same thing here > adapter->ps_state = PS_STATE_AWAKE; > adapter->pm_wakeup_card_req = false; > adapter->pm_wakeup_fw_try = false;
On Fri, 2023-11-10 at 16:38 -0800, Jeff Johnson wrote: > > drivers/net/wireless/marvell/mwifiex/sta_event.c:789 mwifiex_process_sta_event() warn: inconsistent indenting. > > > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > > if (!adapter->pps_uapsd_mode && > > (priv->port_open || > > - (priv->bss_mode == NL80211_IFTYPE_ADHOC)) && > > + (priv->bss_mode == NL80211_IFTYPE_ADHOC)) && > > this change looks incorrect to me > this condition is *inside* the parenthesis from the beginning of the > previous line, and hence this should align after that parenthesis, not > with that parenthesis, which is what the existing code is doing Hah, you're right, I completely missed that! I guess someone should fix their tools :) johannes
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c index df9cdd10a494..9dd3b6d71026 100644 --- a/drivers/net/wireless/marvell/mwifiex/sta_event.c +++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c @@ -762,7 +762,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) mwifiex_dbg(adapter, EVENT, "info: EVENT: AWAKE\n"); if (!adapter->pps_uapsd_mode && (priv->port_open || - (priv->bss_mode == NL80211_IFTYPE_ADHOC)) && + (priv->bss_mode == NL80211_IFTYPE_ADHOC)) && priv->media_connected && adapter->sleep_period.period) { adapter->pps_uapsd_mode = true; mwifiex_dbg(adapter, EVENT, @@ -773,7 +773,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) if (mwifiex_check_last_packet_indication(priv)) { if (adapter->data_sent || (adapter->if_ops.is_port_ready && - !adapter->if_ops.is_port_ready(priv))) { + !adapter->if_ops.is_port_ready(priv))) { adapter->ps_state = PS_STATE_AWAKE; adapter->pm_wakeup_card_req = false; adapter->pm_wakeup_fw_try = false; @@ -781,12 +781,10 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) break; } if (!mwifiex_send_null_packet - (priv, - MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET | - MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET)) - adapter->ps_state = - PS_STATE_SLEEP; - return 0; + (priv, MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET | + MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET)) + adapter->ps_state = PS_STATE_SLEEP; + return 0; } } adapter->ps_state = PS_STATE_AWAKE;
No functional modification involved. drivers/net/wireless/marvell/mwifiex/sta_event.c:789 mwifiex_process_sta_event() warn: inconsistent indenting. Reported-by: Abaci Robot <abaci@linux.alibaba.com> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7226 Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> --- drivers/net/wireless/marvell/mwifiex/sta_event.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)