[PATCH 2/2] Staging: rtl8192u: Make function static

[PATCH 2/2] Staging: rtl8192u: Make function static

[Vatika Harlalka]

This function is used in only one c file and so
its definition is removed from the header file
and it is declared as static.

Signed-off-by: Vatika Harlalka <vatikaharlalka@gmail.com>
---
 drivers/staging/rtl8192u/r8192U.h      | 1 -
 drivers/staging/rtl8192u/r8192U_core.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
index 6c2e438..221dbd7 100644
--- a/drivers/staging/rtl8192u/r8192U.h
+++ b/drivers/staging/rtl8192u/r8192U.h
@@ -1153,7 +1153,6 @@ typedef enum {
 
 bool init_firmware(struct net_device *dev);
 short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb);
-short rtl8192_tx(struct net_device *dev, struct sk_buff *skb);
 
 u32 read_cam(struct net_device *dev, u8 addr);
 void write_cam(struct net_device *dev, u8 addr, u32 data);
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index cbcdcf2..7e3671c 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -942,7 +942,7 @@ static void rtl8192_data_hard_resume(struct net_device *dev)
 {
 	// FIXME !!
 }
-
+static short rtl8192_tx(struct net_device *dev, struct sk_buff *skb);
 /* this function TX data frames when the ieee80211 stack requires this.
  * It checks also if we need to stop the ieee tx queue, eventually do it
  */
@@ -1487,7 +1487,7 @@ static void tx_zero_isr(struct urb *tx_urb)
  * skb->cb will contain all the following information,
  * priority, morefrag, rate, &dev.
  * */
-short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
+static short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
 {
 	struct r8192_priv *priv = ieee80211_priv(dev);
 	cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
-- 
1.9.1

Re: [Outreachy kernel] [PATCH 2/2] Staging: rtl8192u: Make function static

[Jes Sorensen]

On 03/26/15 09:13, Vatika Harlalka wrote:
> This function is used in only one c file and so
> its definition is removed from the header file
> and it is declared as static.
> 
> Signed-off-by: Vatika Harlalka <vatikaharlalka@gmail.com>
> ---
>  drivers/staging/rtl8192u/r8192U.h      | 1 -
>  drivers/staging/rtl8192u/r8192U_core.c | 4 ++--
>  2 files changed, 2 insertions(+), 3 deletions(-)

Hi,

Patches look OK, but you have to use a cover letter when you send
multi-commit patch sets.

Jes


> diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
> index 6c2e438..221dbd7 100644
> --- a/drivers/staging/rtl8192u/r8192U.h
> +++ b/drivers/staging/rtl8192u/r8192U.h
> @@ -1153,7 +1153,6 @@ typedef enum {
>  
>  bool init_firmware(struct net_device *dev);
>  short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb);
> -short rtl8192_tx(struct net_device *dev, struct sk_buff *skb);
>  
>  u32 read_cam(struct net_device *dev, u8 addr);
>  void write_cam(struct net_device *dev, u8 addr, u32 data);
> diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
> index cbcdcf2..7e3671c 100644
> --- a/drivers/staging/rtl8192u/r8192U_core.c
> +++ b/drivers/staging/rtl8192u/r8192U_core.c
> @@ -942,7 +942,7 @@ static void rtl8192_data_hard_resume(struct net_device *dev)
>  {
>  	// FIXME !!
>  }
> -
> +static short rtl8192_tx(struct net_device *dev, struct sk_buff *skb);
>  /* this function TX data frames when the ieee80211 stack requires this.
>   * It checks also if we need to stop the ieee tx queue, eventually do it
>   */
> @@ -1487,7 +1487,7 @@ static void tx_zero_isr(struct urb *tx_urb)
>   * skb->cb will contain all the following information,
>   * priority, morefrag, rate, &dev.
>   * */
> -short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
> +static short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
>  {
>  	struct r8192_priv *priv = ieee80211_priv(dev);
>  	cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
> 

Re: [Outreachy kernel] [PATCH 2/2] Staging: rtl8192u: Make function static

[Vatika Harlalka]

Hi Jes
I will send in a new patchset with a cover letter
for this.
Thanks :)