* [PATCH] staging: rtl8723bs: remove the repeated declaration
@ 2021-05-25 6:18 Shaokun Zhang
2021-05-25 16:21 ` Greg Kroah-Hartman
0 siblings, 1 reply; 5+ messages in thread
From: Shaokun Zhang @ 2021-05-25 6:18 UTC (permalink / raw)
To: linux-staging; +Cc: Shaokun Zhang, Hans de Goede, Greg Kroah-Hartman
Function 'Hal_SetBandwidth' is declared twice, remove the
repeated declaration.
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
---
drivers/staging/rtl8723bs/include/rtw_mp.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/rtl8723bs/include/rtw_mp.h b/drivers/staging/rtl8723bs/include/rtw_mp.h
index 2788ad80b114..ea3abee325ef 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mp.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mp.h
@@ -348,7 +348,6 @@ void Hal_SetCarrierSuppressionTx(struct adapter *padapter, u8 bStart);
void Hal_SetSingleToneTx(struct adapter *padapter, u8 bStart);
void Hal_SetSingleCarrierTx(struct adapter *padapter, u8 bStart);
void Hal_SetContinuousTx(struct adapter *padapter, u8 bStart);
-void Hal_SetBandwidth(struct adapter *padapter);
void Hal_SetDataRate(struct adapter *padapter);
void Hal_SetChannel(struct adapter *padapter);
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: rtl8723bs: remove the repeated declaration
2021-05-25 6:18 [PATCH] staging: rtl8723bs: remove the repeated declaration Shaokun Zhang
@ 2021-05-25 16:21 ` Greg Kroah-Hartman
2021-05-26 6:14 ` Shaokun Zhang
0 siblings, 1 reply; 5+ messages in thread
From: Greg Kroah-Hartman @ 2021-05-25 16:21 UTC (permalink / raw)
To: Shaokun Zhang; +Cc: linux-staging, Hans de Goede
On Tue, May 25, 2021 at 02:18:51PM +0800, Shaokun Zhang wrote:
> Function 'Hal_SetBandwidth' is declared twice, remove the
> repeated declaration.
>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
> ---
> drivers/staging/rtl8723bs/include/rtw_mp.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/staging/rtl8723bs/include/rtw_mp.h b/drivers/staging/rtl8723bs/include/rtw_mp.h
> index 2788ad80b114..ea3abee325ef 100644
> --- a/drivers/staging/rtl8723bs/include/rtw_mp.h
> +++ b/drivers/staging/rtl8723bs/include/rtw_mp.h
> @@ -348,7 +348,6 @@ void Hal_SetCarrierSuppressionTx(struct adapter *padapter, u8 bStart);
> void Hal_SetSingleToneTx(struct adapter *padapter, u8 bStart);
> void Hal_SetSingleCarrierTx(struct adapter *padapter, u8 bStart);
> void Hal_SetContinuousTx(struct adapter *padapter, u8 bStart);
> -void Hal_SetBandwidth(struct adapter *padapter);
>
> void Hal_SetDataRate(struct adapter *padapter);
> void Hal_SetChannel(struct adapter *padapter);
> --
> 2.7.4
>
>
You sent 2 patches with identical subjects, yet they did different
things :(
Please fix up and send a patch series that properly identifies what is
happening here.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: rtl8723bs: remove the repeated declaration
2021-05-25 16:21 ` Greg Kroah-Hartman
@ 2021-05-26 6:14 ` Shaokun Zhang
2021-05-26 6:22 ` Dan Carpenter
0 siblings, 1 reply; 5+ messages in thread
From: Shaokun Zhang @ 2021-05-26 6:14 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-staging, Hans de Goede
Hi Greg,
On 2021/5/26 0:21, Greg Kroah-Hartman wrote:
> On Tue, May 25, 2021 at 02:18:51PM +0800, Shaokun Zhang wrote:
>> Function 'Hal_SetBandwidth' is declared twice, remove the
>> repeated declaration.
>>
>> Cc: Hans de Goede <hdegoede@redhat.com>
>> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
>> ---
>> drivers/staging/rtl8723bs/include/rtw_mp.h | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/staging/rtl8723bs/include/rtw_mp.h b/drivers/staging/rtl8723bs/include/rtw_mp.h
>> index 2788ad80b114..ea3abee325ef 100644
>> --- a/drivers/staging/rtl8723bs/include/rtw_mp.h
>> +++ b/drivers/staging/rtl8723bs/include/rtw_mp.h
>> @@ -348,7 +348,6 @@ void Hal_SetCarrierSuppressionTx(struct adapter *padapter, u8 bStart);
>> void Hal_SetSingleToneTx(struct adapter *padapter, u8 bStart);
>> void Hal_SetSingleCarrierTx(struct adapter *padapter, u8 bStart);
>> void Hal_SetContinuousTx(struct adapter *padapter, u8 bStart);
>> -void Hal_SetBandwidth(struct adapter *padapter);
>>
>> void Hal_SetDataRate(struct adapter *padapter);
>> void Hal_SetChannel(struct adapter *padapter);
>> --
>> 2.7.4
>>
>>
>
> You sent 2 patches with identical subjects, yet they did different
> things :(
>
Oops, my apologies that I didn't check it carefully.
> Please fix up and send a patch series that properly identifies what is
Since both are the trivial patch on rtl8723bs, shall I do a single patch
to cleanup this?
Thanks,
Shaokun
> happening here.
>
> thanks,
>
> greg k-h
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: rtl8723bs: remove the repeated declaration
2021-05-26 6:14 ` Shaokun Zhang
@ 2021-05-26 6:22 ` Dan Carpenter
0 siblings, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2021-05-26 6:22 UTC (permalink / raw)
To: Shaokun Zhang; +Cc: Greg Kroah-Hartman, linux-staging, Hans de Goede
On Wed, May 26, 2021 at 02:14:53PM +0800, Shaokun Zhang wrote:
> Hi Greg,
>
> On 2021/5/26 0:21, Greg Kroah-Hartman wrote:
> > On Tue, May 25, 2021 at 02:18:51PM +0800, Shaokun Zhang wrote:
> >> Function 'Hal_SetBandwidth' is declared twice, remove the
> >> repeated declaration.
> >>
> >> Cc: Hans de Goede <hdegoede@redhat.com>
> >> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> >> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
> >> ---
> >> drivers/staging/rtl8723bs/include/rtw_mp.h | 1 -
> >> 1 file changed, 1 deletion(-)
> >>
> >> diff --git a/drivers/staging/rtl8723bs/include/rtw_mp.h b/drivers/staging/rtl8723bs/include/rtw_mp.h
> >> index 2788ad80b114..ea3abee325ef 100644
> >> --- a/drivers/staging/rtl8723bs/include/rtw_mp.h
> >> +++ b/drivers/staging/rtl8723bs/include/rtw_mp.h
> >> @@ -348,7 +348,6 @@ void Hal_SetCarrierSuppressionTx(struct adapter *padapter, u8 bStart);
> >> void Hal_SetSingleToneTx(struct adapter *padapter, u8 bStart);
> >> void Hal_SetSingleCarrierTx(struct adapter *padapter, u8 bStart);
> >> void Hal_SetContinuousTx(struct adapter *padapter, u8 bStart);
> >> -void Hal_SetBandwidth(struct adapter *padapter);
> >>
> >> void Hal_SetDataRate(struct adapter *padapter);
> >> void Hal_SetChannel(struct adapter *padapter);
> >> --
> >> 2.7.4
> >>
> >>
> >
> > You sent 2 patches with identical subjects, yet they did different
> > things :(
> >
>
> Oops, my apologies that I didn't check it carefully.
>
> > Please fix up and send a patch series that properly identifies what is
>
> Since both are the trivial patch on rtl8723bs, shall I do a single patch
> to cleanup this?
>
Yes. Combine these two patches because they do the same thing to the
same driver.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] staging: rtl8723bs: remove the repeated declaration
@ 2021-05-25 5:41 Shaokun Zhang
0 siblings, 0 replies; 5+ messages in thread
From: Shaokun Zhang @ 2021-05-25 5:41 UTC (permalink / raw)
To: linux-staging; +Cc: Shaokun Zhang, Hans de Goede, Greg Kroah-Hartman
Function 'rtw_indicate_wx_disassoc_event' is declared twice, remove the
repeated declaration.
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
---
drivers/staging/rtl8723bs/include/drv_types.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index 83d43e5726dd..49b404e5cfaf 100644
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -503,7 +503,6 @@ static inline u8 *myid(struct eeprom_priv *peepriv)
void rtw_indicate_wx_disassoc_event(struct adapter *padapter);
void rtw_indicate_wx_assoc_event(struct adapter *padapter);
-void rtw_indicate_wx_disassoc_event(struct adapter *padapter);
void indicate_wx_scan_complete_event(struct adapter *padapter);
int rtw_change_ifname(struct adapter *padapter, const char *ifname);
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-26 6:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-25 6:18 [PATCH] staging: rtl8723bs: remove the repeated declaration Shaokun Zhang
2021-05-25 16:21 ` Greg Kroah-Hartman
2021-05-26 6:14 ` Shaokun Zhang
2021-05-26 6:22 ` Dan Carpenter
-- strict thread matches above, loose matches on Subject: below --
2021-05-25 5:41 Shaokun Zhang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox