2023-06-18 13:05:48

by Yogesh Hegde

[permalink] [raw]
Subject: [PATCH v3 0/4] Trivial code cleanup patches

Rename variables in struct rtllib_device to avoid CamelCase which is not
accepted by checkpatch.

---
v3: The driver is split into 2 modules, calling the functions directly which
the v2 of the patchset does breaks compile. So reverting back to v1 of
the patch as suggested by Greg Kroah-Hartman <[email protected]>.

v2: Removed the variable and called the function directly instead of
just renaming the variable as suggested by Greg Kroah-Hartman
<[email protected]>.



Yogesh Hegde (4):
staging: rtl8192e: Rename variable SetWirelessMode
staging: rtl8192e: Rename variable SetBWModeHandler
staging: rtl8192e: Rename variable LeisurePSLeave
staging: rtl8192e: Rename variable InitialGainHandler

drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 4 ++--
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++----
drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++--
drivers/staging/rtl8192e/rtllib.h | 12 ++++++------
drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
drivers/staging/rtl8192e/rtllib_softmac.c | 12 ++++++------
drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 +++---
7 files changed, 24 insertions(+), 24 deletions(-)

--
2.34.1



2023-06-18 13:08:28

by Yogesh Hegde

[permalink] [raw]
Subject: [PATCH v3 2/4] staging: rtl8192e: Rename variable SetBWModeHandler

Rename variable SetBWModeHandler to set_bw_mode_handler to avoid
CamelCase which is not accepted by checkpatch.

Signed-off-by: Yogesh Hegde <[email protected]>
---

v3: Revert back to v1 of the patch as suggested by Greg Kroah-Hartman
<[email protected]>.

v2: Removed the variable and called the function directly instead of
just renaming the variable as suggested by Greg Kroah-Hartman
<[email protected]>.
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++--
drivers/staging/rtl8192e/rtllib.h | 6 +++---
drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 699c4accf2db..68e921a3a0a8 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -718,7 +718,7 @@ static void _rtl92e_init_priv_handler(struct net_device *dev)
priv->rtllib->handle_beacon = _rtl92e_handle_beacon;
priv->rtllib->set_wireless_mode = rtl92e_set_wireless_mode;
priv->rtllib->LeisurePSLeave = rtl92e_leisure_ps_leave;
- priv->rtllib->SetBWModeHandler = rtl92e_set_bw_mode;
+ priv->rtllib->set_bw_mode_handler = rtl92e_set_bw_mode;
priv->rf_set_chan = rtl92e_set_channel;

priv->rtllib->start_send_beacons = rtl92e_start_beacon;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index fe30a291e64c..1fe504244437 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -835,11 +835,11 @@ static void HTSetConnectBwModeCallback(struct rtllib_device *ieee)
ieee->set_chan(ieee->dev,
ieee->current_network.channel);

- ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20_40,
+ ieee->set_bw_mode_handler(ieee->dev, HT_CHANNEL_WIDTH_20_40,
ht_info->CurSTAExtChnlOffset);
} else {
ieee->set_chan(ieee->dev, ieee->current_network.channel);
- ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20,
+ ieee->set_bw_mode_handler(ieee->dev, HT_CHANNEL_WIDTH_20,
HT_EXTCHNL_OFFSET_NO_EXT);
}

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index f91355de17f7..e79510258447 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1704,9 +1704,9 @@ struct rtllib_device {

/* check whether Tx hw resource available */
short (*check_nic_enough_desc)(struct net_device *dev, int queue_index);
- void (*SetBWModeHandler)(struct net_device *dev,
- enum ht_channel_width bandwidth,
- enum ht_extchnl_offset Offset);
+ void (*set_bw_mode_handler)(struct net_device *dev,
+ enum ht_channel_width bandwidth,
+ enum ht_extchnl_offset Offset);
bool (*GetNmodeSupportBySecCfg)(struct net_device *dev);
void (*set_wireless_mode)(struct net_device *dev, u8 wireless_mode);
bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device *dev);
diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index d6d90e6ba2d3..6a7738a828e1 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -335,7 +335,7 @@ void rtllib_wx_sync_scan_wq(void *data)
b40M = 1;
chan_offset = ieee->ht_info->CurSTAExtChnlOffset;
bandwidth = (enum ht_channel_width)ieee->ht_info->bCurBW40MHz;
- ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20,
+ ieee->set_bw_mode_handler(ieee->dev, HT_CHANNEL_WIDTH_20,
HT_EXTCHNL_OFFSET_NO_EXT);
}

@@ -348,7 +348,7 @@ void rtllib_wx_sync_scan_wq(void *data)
ieee->set_chan(ieee->dev, chan - 2);
else
ieee->set_chan(ieee->dev, chan);
- ieee->SetBWModeHandler(ieee->dev, bandwidth, chan_offset);
+ ieee->set_bw_mode_handler(ieee->dev, bandwidth, chan_offset);
} else {
ieee->set_chan(ieee->dev, chan);
}
--
2.34.1


2023-06-18 13:17:32

by Yogesh Hegde

[permalink] [raw]
Subject: [PATCH v3 3/4] staging: rtl8192e: Rename variable LeisurePSLeave

Rename variable LeisurePSLeave to leisure_ps_leave to avoid
CamelCase which is not accepted by checkpatch.

Signed-off-by: Yogesh Hegde <[email protected]>
---

v3: Revert back to v1 of the patch as suggested by Greg Kroah-Hartman
<[email protected]>.

v2: Removed the variable and called the function directly instead of
just renaming the variable as suggested by Greg Kroah-Hartman
<[email protected]>.
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 68e921a3a0a8..b82d2b7aa26c 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -717,7 +717,7 @@ static void _rtl92e_init_priv_handler(struct net_device *dev)
priv->rtllib->handle_assoc_response = _rtl92e_handle_assoc_response;
priv->rtllib->handle_beacon = _rtl92e_handle_beacon;
priv->rtllib->set_wireless_mode = rtl92e_set_wireless_mode;
- priv->rtllib->LeisurePSLeave = rtl92e_leisure_ps_leave;
+ priv->rtllib->leisure_ps_leave = rtl92e_leisure_ps_leave;
priv->rtllib->set_bw_mode_handler = rtl92e_set_bw_mode;
priv->rf_set_chan = rtl92e_set_channel;

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index e79510258447..0ee9b99b4c5e 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1721,7 +1721,7 @@ struct rtllib_device {

void (*rtllib_ips_leave_wq)(struct net_device *dev);
void (*rtllib_ips_leave)(struct net_device *dev);
- void (*LeisurePSLeave)(struct net_device *dev);
+ void (*leisure_ps_leave)(struct net_device *dev);

/* This must be the last item so that it points to the data
* allocated beyond this structure by alloc_rtllib
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 46c77ed335ab..c00f72316a3d 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -1200,7 +1200,7 @@ static void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast,
if (((ieee->link_detect_info.NumRxUnicastOkInPeriod +
ieee->link_detect_info.NumTxOkInPeriod) > 8) ||
(ieee->link_detect_info.NumRxUnicastOkInPeriod > 2)) {
- ieee->LeisurePSLeave(ieee->dev);
+ ieee->leisure_ps_leave(ieee->dev);
}
}
}
diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index 6a7738a828e1..d7df6f698c0c 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -316,7 +316,7 @@ void rtllib_wx_sync_scan_wq(void *data)

chan = ieee->current_network.channel;

- ieee->LeisurePSLeave(ieee->dev);
+ ieee->leisure_ps_leave(ieee->dev);
/* notify AP to be in PS mode */
rtllib_sta_ps_send_null_frame(ieee, 1);
rtllib_sta_ps_send_null_frame(ieee, 1);
--
2.34.1


2023-06-18 13:22:48

by Yogesh Hegde

[permalink] [raw]
Subject: [PATCH v3 1/4] staging: rtl8192e: Rename variable SetWirelessMode

Rename variable SetWirelessMode to set_wireless_mode to avoid
CamelCase which is not accepted by checkpatch.

Signed-off-by: Yogesh Hegde <[email protected]>
---

v3: Revert back to v1 of the patch as suggested by Greg Kroah-Hartman
<[email protected]>.

v2: Removed the variable and called the function directly instead of
just renaming the variable as suggested by Greg Kroah-Hartman
<[email protected]>.
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
drivers/staging/rtl8192e/rtllib_softmac.c | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 17b70dde7eeb..699c4accf2db 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -716,7 +716,7 @@ static void _rtl92e_init_priv_handler(struct net_device *dev)
priv->rtllib->check_nic_enough_desc = _rtl92e_check_nic_enough_desc;
priv->rtllib->handle_assoc_response = _rtl92e_handle_assoc_response;
priv->rtllib->handle_beacon = _rtl92e_handle_beacon;
- priv->rtllib->SetWirelessMode = rtl92e_set_wireless_mode;
+ priv->rtllib->set_wireless_mode = rtl92e_set_wireless_mode;
priv->rtllib->LeisurePSLeave = rtl92e_leisure_ps_leave;
priv->rtllib->SetBWModeHandler = rtl92e_set_bw_mode;
priv->rf_set_chan = rtl92e_set_channel;
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 87e9169214f6..f91355de17f7 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1708,7 +1708,7 @@ struct rtllib_device {
enum ht_channel_width bandwidth,
enum ht_extchnl_offset Offset);
bool (*GetNmodeSupportBySecCfg)(struct net_device *dev);
- void (*SetWirelessMode)(struct net_device *dev, u8 wireless_mode);
+ void (*set_wireless_mode)(struct net_device *dev, u8 wireless_mode);
bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device *dev);
u8 (*rtllib_ap_sec_type)(struct rtllib_device *ieee);
void (*InitialGainHandler)(struct net_device *dev, u8 Operation);
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 821ca86b8bcd..1c48e1ee5baf 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -1472,7 +1472,7 @@ static void rtllib_associate_complete_wq(void *data)
netdev_info(ieee->dev, "Using G rates:%d\n", ieee->rate);
} else {
ieee->rate = 22;
- ieee->SetWirelessMode(ieee->dev, IEEE_B);
+ ieee->set_wireless_mode(ieee->dev, IEEE_B);
netdev_info(ieee->dev, "Using B rates:%d\n", ieee->rate);
}
if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) {
@@ -1656,13 +1656,13 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
(ieee->modulation &
RTLLIB_OFDM_MODULATION)) {
ieee->rate = 108;
- ieee->SetWirelessMode(ieee->dev,
+ ieee->set_wireless_mode(ieee->dev,
IEEE_G);
netdev_info(ieee->dev,
"Using G rates\n");
} else {
ieee->rate = 22;
- ieee->SetWirelessMode(ieee->dev,
+ ieee->set_wireless_mode(ieee->dev,
IEEE_B);
netdev_info(ieee->dev,
"Using B rates\n");
@@ -2237,11 +2237,11 @@ static void rtllib_rx_auth_resp(struct rtllib_device *ieee, struct sk_buff *skb)
}
/* Dummy wirless mode setting to avoid encryption issue */
if (bSupportNmode) {
- ieee->SetWirelessMode(ieee->dev,
+ ieee->set_wireless_mode(ieee->dev,
ieee->current_network.mode);
} else {
/*TODO*/
- ieee->SetWirelessMode(ieee->dev, IEEE_G);
+ ieee->set_wireless_mode(ieee->dev, IEEE_G);
}

if ((ieee->current_network.mode == IEEE_N_24G) &&
@@ -2570,7 +2570,7 @@ static void rtllib_start_ibss_wq(void *data)
}

ieee->current_network.qos_data.supported = 0;
- ieee->SetWirelessMode(ieee->dev, IEEE_G);
+ ieee->set_wireless_mode(ieee->dev, IEEE_G);
ieee->current_network.mode = ieee->mode;
ieee->current_network.atim_window = 0;
ieee->current_network.capability = WLAN_CAPABILITY_IBSS;
--
2.34.1


2023-06-18 14:07:33

by Yogesh Hegde

[permalink] [raw]
Subject: [PATCH v3 4/4] staging: rtl8192e: Rename variable InitialGainHandler

Rename variable InitialGainHandler to init_gain_handler to avoid
CamelCase which is not accepted by checkpatch.

Signed-off-by: Yogesh Hegde <[email protected]>
---

v3: Revert back to v1 of the patch as suggested by Greg Kroah-Hartman
<[email protected]>.

v2: Removed the variable and called the function directly instead of
just renaming the variable as suggested by Greg Kroah-Hartman
<[email protected]>.
---
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 4 ++--
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 7b0da55fa7aa..267fc6f8800e 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -1109,11 +1109,11 @@ void rtl92e_scan_op_backup(struct net_device *dev, u8 Operation)
if (priv->up) {
switch (Operation) {
case SCAN_OPT_BACKUP:
- priv->rtllib->InitialGainHandler(dev, IG_Backup);
+ priv->rtllib->init_gain_handler(dev, IG_Backup);
break;

case SCAN_OPT_RESTORE:
- priv->rtllib->InitialGainHandler(dev, IG_Restore);
+ priv->rtllib->init_gain_handler(dev, IG_Restore);
break;
}
}
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index b82d2b7aa26c..eb20b8014997 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -734,7 +734,7 @@ static void _rtl92e_init_priv_handler(struct net_device *dev)

priv->rtllib->SetHwRegHandler = rtl92e_set_reg;
priv->rtllib->AllowAllDestAddrHandler = rtl92e_set_monitor_mode;
- priv->rtllib->InitialGainHandler = rtl92e_init_gain;
+ priv->rtllib->init_gain_handler = rtl92e_init_gain;
priv->rtllib->rtllib_ips_leave_wq = rtl92e_rtllib_ips_leave_wq;
priv->rtllib->rtllib_ips_leave = rtl92e_rtllib_ips_leave;
priv->rtllib->ScanOperationBackupHandler = rtl92e_scan_op_backup;
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 0ee9b99b4c5e..0551f9b108f6 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1711,7 +1711,7 @@ struct rtllib_device {
void (*set_wireless_mode)(struct net_device *dev, u8 wireless_mode);
bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device *dev);
u8 (*rtllib_ap_sec_type)(struct rtllib_device *ieee);
- void (*InitialGainHandler)(struct net_device *dev, u8 Operation);
+ void (*init_gain_handler)(struct net_device *dev, u8 Operation);
void (*ScanOperationBackupHandler)(struct net_device *dev,
u8 Operation);
void (*SetHwRegHandler)(struct net_device *dev, u8 variable, u8 *val);
--
2.34.1


2023-06-18 20:50:22

by Philipp Hortmann

[permalink] [raw]
Subject: Re: [PATCH v3 0/4] Trivial code cleanup patches

On 6/18/23 15:03, Yogesh Hegde wrote:
> Rename variables in struct rtllib_device to avoid CamelCase which is not
> accepted by checkpatch.
>
> ---
> v3: The driver is split into 2 modules, calling the functions directly which
> the v2 of the patchset does breaks compile. So reverting back to v1 of
> the patch as suggested by Greg Kroah-Hartman <[email protected]>.
>
> v2: Removed the variable and called the function directly instead of
> just renaming the variable as suggested by Greg Kroah-Hartman
> <[email protected]>.
>
>
>
> Yogesh Hegde (4):
> staging: rtl8192e: Rename variable SetWirelessMode
> staging: rtl8192e: Rename variable SetBWModeHandler
> staging: rtl8192e: Rename variable LeisurePSLeave
> staging: rtl8192e: Rename variable InitialGainHandler
>
> drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 4 ++--
> drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++----
> drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++--
> drivers/staging/rtl8192e/rtllib.h | 12 ++++++------
> drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
> drivers/staging/rtl8192e/rtllib_softmac.c | 12 ++++++------
> drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 +++---
> 7 files changed, 24 insertions(+), 24 deletions(-)
>
This patch series alone is fine. But when my patch series ([PATCH 0/9]
staging: rtl8192e: Remove unsupported modes a and 5G) is applied before
it fails as we change same lines. Will see what happens.

Tested-by: Philipp Hortmann <[email protected]>





2023-06-19 13:06:31

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH v3 0/4] Trivial code cleanup patches

On Sun, Jun 18, 2023 at 10:26:37PM +0200, Philipp Hortmann wrote:
> On 6/18/23 15:03, Yogesh Hegde wrote:
> > Rename variables in struct rtllib_device to avoid CamelCase which is not
> > accepted by checkpatch.
> >
> > ---
> > v3: The driver is split into 2 modules, calling the functions directly which
> > the v2 of the patchset does breaks compile. So reverting back to v1 of
> > the patch as suggested by Greg Kroah-Hartman <[email protected]>.
> >
> > v2: Removed the variable and called the function directly instead of
> > just renaming the variable as suggested by Greg Kroah-Hartman
> > <[email protected]>.
> >
> >
> >
> > Yogesh Hegde (4):
> > staging: rtl8192e: Rename variable SetWirelessMode
> > staging: rtl8192e: Rename variable SetBWModeHandler
> > staging: rtl8192e: Rename variable LeisurePSLeave
> > staging: rtl8192e: Rename variable InitialGainHandler
> >
> > drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 4 ++--
> > drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++----
> > drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++--
> > drivers/staging/rtl8192e/rtllib.h | 12 ++++++------
> > drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
> > drivers/staging/rtl8192e/rtllib_softmac.c | 12 ++++++------
> > drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 +++---
> > 7 files changed, 24 insertions(+), 24 deletions(-)
> >
> This patch series alone is fine. But when my patch series ([PATCH 0/9]
> staging: rtl8192e: Remove unsupported modes a and 5G) is applied before it
> fails as we change same lines. Will see what happens.

Yes, none of these apply :(

Yogesh, can you rebase this on my staging-next branch and resend?

thanks,

greg k-h

2023-06-19 14:03:52

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH v3 0/4] Trivial code cleanup patches

On Mon, Jun 19, 2023 at 07:19:21PM +0530, Yogesh Hegde wrote:
> Hi Greg,
> On Mon, Jun 19, 2023 at 02:57:56PM +0200, Greg Kroah-Hartman wrote:
> > On Sun, Jun 18, 2023 at 10:26:37PM +0200, Philipp Hortmann wrote:
> > > This patch series alone is fine. But when my patch series ([PATCH 0/9]
> > > staging: rtl8192e: Remove unsupported modes a and 5G) is applied before it
> > > fails as we change same lines. Will see what happens.
> >
> > Yes, none of these apply :(
> >
> > Yogesh, can you rebase this on my staging-next branch and resend?
> Sure, will rebase and resend. Did you mean staging-testing branch instead of
> staging-next branch ?

Yes, sorry.


2023-06-19 14:10:25

by Yogesh Hegde

[permalink] [raw]
Subject: Re: [PATCH v3 0/4] Trivial code cleanup patches

Hi Greg,
On Mon, Jun 19, 2023 at 02:57:56PM +0200, Greg Kroah-Hartman wrote:
> On Sun, Jun 18, 2023 at 10:26:37PM +0200, Philipp Hortmann wrote:
> > This patch series alone is fine. But when my patch series ([PATCH 0/9]
> > staging: rtl8192e: Remove unsupported modes a and 5G) is applied before it
> > fails as we change same lines. Will see what happens.
>
> Yes, none of these apply :(
>
> Yogesh, can you rebase this on my staging-next branch and resend?
Sure, will rebase and resend. Did you mean staging-testing branch instead of
staging-next branch ?

The patch series is rebased to commit "f99bbb4412ce axis-fifo: remove the
unnecessary dev_info()" which is the HEAD of staging-next.
Latest changes by Philipp are merged into staging-testing branch.
Let me know if you still want to rebase it to staging-next branch.

Regards
Yogesh