From de5c5bb23c77fe62987b446c740b971e85105526 Mon Sep 17 00:00:00 2001
From: Ahmet Sezgin Duran <[email protected]>
Date: Tue, 6 Feb 2024 22:28:55 +0300
Subject: [PATCH] staging: rtl8192e: remove redundant braces from single line
if-else blocks
This commit cleans up redundant braces from single line if-else blocks
for improved readability.
Signed-off-by: Ahmet Sezgin Duran <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 ++---
drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 9b9d95ba06df..080fe9c4585e 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -693,11 +693,10 @@ void rtl92e_link_change(struct net_device *dev)
u32 reg;
reg = rtl92e_readl(dev, RCR);
- if (priv->rtllib->link_state == MAC80211_LINKED) {
+ if (priv->rtllib->link_state == MAC80211_LINKED)
priv->receive_config = reg |= RCR_CBSSID;
- } else {
+ else
priv->receive_config = reg &= ~RCR_CBSSID;
- }
rtl92e_writel(dev, RCR, reg);
}
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 6d0912f90198..49b882c363bf 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -480,9 +480,9 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
}
ht_info->current_mpdu_density = pPeerHTCap->MPDUDensity;
- if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) {
+ if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K)
ht_info->current_ampdu_enable = false;
- }
+
ht_info->cur_rx_reorder_enable = 1;
if (pPeerHTCap->MCS[0] == 0)
--
2.43.0
On Tue, Feb 06, 2024 at 11:53:38PM +0300, Ahmet Sezgin Duran wrote:
> >From de5c5bb23c77fe62987b446c740b971e85105526 Mon Sep 17 00:00:00 2001
> From: Ahmet Sezgin Duran <[email protected]>
> Date: Tue, 6 Feb 2024 22:28:55 +0300
> Subject: [PATCH] staging: rtl8192e: remove redundant braces from single line
> if-else blocks
Why is all of this here in the changelog body?
Please fix up and send a v2.
thanks,
greg k-h
On 2/7/24 11:13, Greg KH wrote:
> On Tue, Feb 06, 2024 at 11:53:38PM +0300, Ahmet Sezgin Duran wrote:
>> >From de5c5bb23c77fe62987b446c740b971e85105526 Mon Sep 17 00:00:00 2001
>> From: Ahmet Sezgin Duran <[email protected]>
>> Date: Tue, 6 Feb 2024 22:28:55 +0300
>> Subject: [PATCH] staging: rtl8192e: remove redundant braces from single line
>> if-else blocks
>
> Why is all of this here in the changelog body?
>
> Please fix up and send a v2.
>
There is already a pending patch with these changes.
https://lore.kernel.org/lkml/[email protected]/
regards,
Michael
> Why is all of this here in the changelog body?
>
> Please fix up and send a v2.
>
> thanks,
>
> greg k-h
Sorry, I forgot to remove those before sending.
Should I send a v2, even though Michael Straube has already sent a patch?
(didn't know)
Regards,
Ahmet
On Wed, Feb 07, 2024 at 02:13:14PM +0300, Ahmet Sezgin Duran wrote:
> > Why is all of this here in the changelog body?
> >
> > Please fix up and send a v2.
> >
> > thanks,
> >
> > greg k-h
>
> Sorry, I forgot to remove those before sending.
>
> Should I send a v2, even though Michael Straube has already sent a patch?
> (didn't know)
No, don't bother. Patches are merged first come first serve. Michael's
patch will get merged first.
regards,
dan carpenter