[PATCH 0/3] staging: rtl8188eu: Remove unnecessary functions

[PATCH 0/3] staging: rtl8188eu: Remove unnecessary functions

[Amitoj Kaur Chawla]

This patchset removes unnecessary functions that aren't used, or can be replaced by a single line of code.

Amitoj Kaur Chawla (3):
  staging: rtl8188eu: core: Remove unnecessary functions
  staging: rtl8188eu: Remove unused function
  staging: rtl8188eu: core: Remove wrapper function

 drivers/staging/rtl8188eu/core/rtw_ap.c       | 54 +--------------------------
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 24 +++++-------
 drivers/staging/rtl8188eu/core/rtw_xmit.c     |  5 ---
 drivers/staging/rtl8188eu/include/rtw_xmit.h  |  1 -
 4 files changed, 10 insertions(+), 74 deletions(-)

-- 
1.9.1

[PATCH 1/3] staging: rtl8188eu: core: Remove unnecessary functions

[Amitoj Kaur Chawla]

Drop unnecessary functions that are declared but not being used.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
---
 drivers/staging/rtl8188eu/core/rtw_ap.c | 54 +--------------------------------
 1 file changed, 1 insertion(+), 53 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 5c45f8a..aab9918 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -1240,11 +1240,6 @@ int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
 	return 0;
 }
 
-static void update_bcn_fixed_ie(struct adapter *padapter)
-{
-	DBG_88E("%s\n", __func__);
-}
-
 static void update_bcn_erpinfo_ie(struct adapter *padapter)
 {
 	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@@ -1279,31 +1274,6 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)
 	}
 }
 
-static void update_bcn_htcap_ie(struct adapter *padapter)
-{
-	DBG_88E("%s\n", __func__);
-}
-
-static void update_bcn_htinfo_ie(struct adapter *padapter)
-{
-	DBG_88E("%s\n", __func__);
-}
-
-static void update_bcn_rsn_ie(struct adapter *padapter)
-{
-	DBG_88E("%s\n", __func__);
-}
-
-static void update_bcn_wpa_ie(struct adapter *padapter)
-{
-	DBG_88E("%s\n", __func__);
-}
-
-static void update_bcn_wmm_ie(struct adapter *padapter)
-{
-	DBG_88E("%s\n", __func__);
-}
-
 static void update_bcn_wps_ie(struct adapter *padapter)
 {
 	u8 *pwps_ie = NULL, *pwps_ie_src;
@@ -1354,22 +1324,12 @@ static void update_bcn_wps_ie(struct adapter *padapter)
 	kfree(pbackup_remainder_ie);
 }
 
-static void update_bcn_p2p_ie(struct adapter *padapter)
-{
-}
-
 static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8 *oui)
 {
 	DBG_88E("%s\n", __func__);
 
-	if (!memcmp(RTW_WPA_OUI, oui, 4))
-		update_bcn_wpa_ie(padapter);
-	else if (!memcmp(WMM_OUI, oui, 4))
-		update_bcn_wmm_ie(padapter);
-	else if (!memcmp(WPS_OUI, oui, 4))
+	if (!memcmp(WPS_OUI, oui, 4))
 		update_bcn_wps_ie(padapter);
-	else if (!memcmp(P2P_OUI, oui, 4))
-		update_bcn_p2p_ie(padapter);
 	else
 		DBG_88E("unknown OUI type!\n");
 }
@@ -1391,24 +1351,12 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
 	spin_lock_bh(&pmlmepriv->bcn_update_lock);
 
 	switch (ie_id) {
-	case 0xFF:
-		update_bcn_fixed_ie(padapter);/* 8: TimeStamp, 2: Beacon Interval 2:Capability */
-		break;
 	case _TIM_IE_:
 		update_BCNTIM(padapter);
 		break;
 	case _ERPINFO_IE_:
 		update_bcn_erpinfo_ie(padapter);
 		break;
-	case _HT_CAPABILITY_IE_:
-		update_bcn_htcap_ie(padapter);
-		break;
-	case _RSN_IE_2_:
-		update_bcn_rsn_ie(padapter);
-		break;
-	case _HT_ADD_INFO_IE_:
-		update_bcn_htinfo_ie(padapter);
-		break;
 	case _VENDOR_SPECIFIC_IE_:
 		update_bcn_vendor_spec_ie(padapter, oui);
 		break;
-- 
1.9.1

[PATCH 2/3] staging: rtl8188eu: Remove unused function

[Amitoj Kaur Chawla]

Remove function that is declared but not called anywhere.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
---
 drivers/staging/rtl8188eu/core/rtw_xmit.c    | 5 -----
 drivers/staging/rtl8188eu/include/rtw_xmit.h | 1 -
 2 files changed, 6 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index cabb810..11dbfc0 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -2186,11 +2186,6 @@ void rtw_sctx_done_err(struct submit_ctx **sctx, int status)
 	}
 }
 
-void rtw_sctx_done(struct submit_ctx **sctx)
-{
-	rtw_sctx_done_err(sctx, RTW_SCTX_DONE_SUCCESS);
-}
-
 int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms)
 {
 	struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
diff --git a/drivers/staging/rtl8188eu/include/rtw_xmit.h b/drivers/staging/rtl8188eu/include/rtw_xmit.h
index 62f5db1..b7c2088 100644
--- a/drivers/staging/rtl8188eu/include/rtw_xmit.h
+++ b/drivers/staging/rtl8188eu/include/rtw_xmit.h
@@ -197,7 +197,6 @@ enum {
 void rtw_sctx_init(struct submit_ctx *sctx, int timeout_ms);
 int rtw_sctx_wait(struct submit_ctx *sctx);
 void rtw_sctx_done_err(struct submit_ctx **sctx, int status);
-void rtw_sctx_done(struct submit_ctx **sctx);
 
 struct xmit_buf {
 	struct list_head list;
-- 
1.9.1

[PATCH 3/3] staging: rtl8188eu: core: Remove wrapper function

[Amitoj Kaur Chawla]

Remove wrapper function that can be replaced by a single line of code.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
---
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 0270755..fec9ce1 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -701,12 +701,6 @@ exit:
 	return ret;
 }
 
-static inline void issue_probereq(struct adapter *padapter,
-				  struct ndis_802_11_ssid *pssid, u8 *da)
-{
-	_issue_probereq(padapter, pssid, da, false);
-}
-
 static int issue_probereq_ex(struct adapter *padapter,
 			     struct ndis_802_11_ssid *pssid, u8 *da,
 			     int try_cnt, int wait_ms)
@@ -2029,24 +2023,24 @@ static void site_survey(struct adapter *padapter)
 			for (i = 0; i < RTW_SSID_SCAN_AMOUNT; i++) {
 				if (pmlmeext->sitesurvey_res.ssid[i].SsidLength) {
 					/* todo: to issue two probe req??? */
-					issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL);
+					_issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL, false);
 					/* msleep(SURVEY_TO>>1); */
-					issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL);
+					_issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL, false);
 				}
 			}
 
 			if (pmlmeext->sitesurvey_res.scan_mode == SCAN_ACTIVE) {
 				/* todo: to issue two probe req??? */
-				issue_probereq(padapter, NULL, NULL);
+				_issue_probereq(padapter, NULL, NULL, false);
 				/* msleep(SURVEY_TO>>1); */
-				issue_probereq(padapter, NULL, NULL);
+				_issue_probereq(padapter, NULL, NULL, false);
 			}
 
 			if (pmlmeext->sitesurvey_res.scan_mode == SCAN_ACTIVE) {
 				/* todo: to issue two probe req??? */
-				issue_probereq(padapter, NULL, NULL);
+				_issue_probereq(padapter, NULL, NULL, false);
 				/* msleep(SURVEY_TO>>1); */
-				issue_probereq(padapter, NULL, NULL);
+				_issue_probereq(padapter, NULL, NULL, false);
 			}
 		}
 
@@ -4820,9 +4814,9 @@ void linked_status_chk(struct adapter *padapter)
 			} else {
 				if (rx_chk != _SUCCESS) {
 					if (pmlmeext->retry == 0) {
-						issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress);
-						issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress);
-						issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress);
+						_issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress, false);
+						_issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress, false);
+						_issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress, false);
 					}
 				}
 
-- 
1.9.1

Re: [Outreachy kernel] [PATCH 3/3] staging: rtl8188eu: core: Remove wrapper function

[Julia Lawall]

On Tue, 27 Oct 2015, Amitoj Kaur Chawla wrote:

> Remove wrapper function that can be replaced by a single line of code.
>
> Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
> ---
>  drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 24 +++++++++---------------
>  1 file changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> index 0270755..fec9ce1 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> @@ -701,12 +701,6 @@ exit:
>  	return ret;
>  }
>
> -static inline void issue_probereq(struct adapter *padapter,
> -				  struct ndis_802_11_ssid *pssid, u8 *da)
> -{
> -	_issue_probereq(padapter, pssid, da, false);
> -}

If issue_probereq is not going to be used, then maybe _issue_probereq
should be renamed as issue_probereq?  Is _issue_probereq actually ever
called with something other than false as the last argument?

julia

>  static int issue_probereq_ex(struct adapter *padapter,
>  			     struct ndis_802_11_ssid *pssid, u8 *da,
>  			     int try_cnt, int wait_ms)
> @@ -2029,24 +2023,24 @@ static void site_survey(struct adapter *padapter)
>  			for (i = 0; i < RTW_SSID_SCAN_AMOUNT; i++) {
>  				if (pmlmeext->sitesurvey_res.ssid[i].SsidLength) {
>  					/* todo: to issue two probe req??? */
> -					issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL);
> +					_issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL, false);
>  					/* msleep(SURVEY_TO>>1); */
> -					issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL);
> +					_issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL, false);
>  				}
>  			}
>
>  			if (pmlmeext->sitesurvey_res.scan_mode == SCAN_ACTIVE) {
>  				/* todo: to issue two probe req??? */
> -				issue_probereq(padapter, NULL, NULL);
> +				_issue_probereq(padapter, NULL, NULL, false);
>  				/* msleep(SURVEY_TO>>1); */
> -				issue_probereq(padapter, NULL, NULL);
> +				_issue_probereq(padapter, NULL, NULL, false);
>  			}
>
>  			if (pmlmeext->sitesurvey_res.scan_mode == SCAN_ACTIVE) {
>  				/* todo: to issue two probe req??? */
> -				issue_probereq(padapter, NULL, NULL);
> +				_issue_probereq(padapter, NULL, NULL, false);
>  				/* msleep(SURVEY_TO>>1); */
> -				issue_probereq(padapter, NULL, NULL);
> +				_issue_probereq(padapter, NULL, NULL, false);
>  			}
>  		}
>
> @@ -4820,9 +4814,9 @@ void linked_status_chk(struct adapter *padapter)
>  			} else {
>  				if (rx_chk != _SUCCESS) {
>  					if (pmlmeext->retry == 0) {
> -						issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress);
> -						issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress);
> -						issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress);
> +						_issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress, false);
> +						_issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress, false);
> +						_issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress, false);
>  					}
>  				}
>
> --
> 1.9.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/fd49b1325d024358440e5df7b74fd18bc252cdb4.1445966850.git.amitoj1606%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [Outreachy kernel] [PATCH 3/3] staging: rtl8188eu: core: Remove wrapper function

[Amitoj Kaur Chawla]

On Wed, Oct 28, 2015 at 2:58 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
>
>
>
> On Tue, 27 Oct 2015, Amitoj Kaur Chawla wrote:
>
> > Remove wrapper function that can be replaced by a single line of code.
> >
> > Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
> > ---
> >  drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 24 +++++++++---------------
> >  1 file changed, 9 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> > index 0270755..fec9ce1 100644
> > --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> > +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> > @@ -701,12 +701,6 @@ exit:
> >       return ret;
> >  }
> >
> > -static inline void issue_probereq(struct adapter *padapter,
> > -                               struct ndis_802_11_ssid *pssid, u8 *da)
> > -{
> > -     _issue_probereq(padapter, pssid, da, false);
> > -}
>
> If issue_probereq is not going to be used, then maybe _issue_probereq
> should be renamed as issue_probereq?  Is _issue_probereq actually ever
> called with something other than false as the last argument?

I can rename it to issue_probereq.

It isn't called anywhere with something other than false.
Your thoughts?

-- 
Amitoj

Re: [Outreachy kernel] [PATCH 3/3] staging: rtl8188eu: core: Remove wrapper function

[Julia Lawall]

On Wed, 28 Oct 2015, Amitoj Kaur Chawla wrote:

> On Wed, Oct 28, 2015 at 2:58 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
> >
> >
> >
> > On Tue, 27 Oct 2015, Amitoj Kaur Chawla wrote:
> >
> > > Remove wrapper function that can be replaced by a single line of code.
> > >
> > > Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
> > > ---
> > >  drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 24 +++++++++---------------
> > >  1 file changed, 9 insertions(+), 15 deletions(-)
> > >
> > > diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> > > index 0270755..fec9ce1 100644
> > > --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> > > +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> > > @@ -701,12 +701,6 @@ exit:
> > >       return ret;
> > >  }
> > >
> > > -static inline void issue_probereq(struct adapter *padapter,
> > > -                               struct ndis_802_11_ssid *pssid, u8 *da)
> > > -{
> > > -     _issue_probereq(padapter, pssid, da, false);
> > > -}
> >
> > If issue_probereq is not going to be used, then maybe _issue_probereq
> > should be renamed as issue_probereq?  Is _issue_probereq actually ever
> > called with something other than false as the last argument?
>
> I can rename it to issue_probereq.
>
> It isn't called anywhere with something other than false.
> Your thoughts?

If you are sure that the argument is always false, maybe it could be
simplified away.  It looks like the whole setup with the _ was a hack to
allow that value to vary in some case, but maybe it isn't needed any more.

julia

Re: [Outreachy kernel] [PATCH 3/3] staging: rtl8188eu: core: Remove wrapper function

[Amitoj Kaur Chawla]

On Wed, Oct 28, 2015 at 7:35 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
>
>
> On Wed, 28 Oct 2015, Amitoj Kaur Chawla wrote:
>
>> On Wed, Oct 28, 2015 at 2:58 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
>> >
>> >
>> >
>> > On Tue, 27 Oct 2015, Amitoj Kaur Chawla wrote:
>> >
>> > > Remove wrapper function that can be replaced by a single line of code.
>> > >
>> > > Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
>> > > ---
>> > >  drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 24 +++++++++---------------
>> > >  1 file changed, 9 insertions(+), 15 deletions(-)
>> > >
>> > > diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
>> > > index 0270755..fec9ce1 100644
>> > > --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
>> > > +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
>> > > @@ -701,12 +701,6 @@ exit:
>> > >       return ret;
>> > >  }
>> > >
>> > > -static inline void issue_probereq(struct adapter *padapter,
>> > > -                               struct ndis_802_11_ssid *pssid, u8 *da)
>> > > -{
>> > > -     _issue_probereq(padapter, pssid, da, false);
>> > > -}
>> >
>> > If issue_probereq is not going to be used, then maybe _issue_probereq
>> > should be renamed as issue_probereq?  Is _issue_probereq actually ever
>> > called with something other than false as the last argument?
>>
>> I can rename it to issue_probereq.
>>
>> It isn't called anywhere with something other than false.
>> Your thoughts?
>
> If you are sure that the argument is always false, maybe it could be
> simplified away.  It looks like the whole setup with the _ was a hack to
> allow that value to vary in some case, but maybe it isn't needed any more.
>
> julia

In the function _issue_probereq there's an if condition based on the
argument that is always false. So we can remove the if condition for
the argument being true.

-- 
Amitoj