[PATCH] staging: r8712u: Fix sparse message

[PATCH] staging: r8712u: Fix sparse message

[Larry Finger]

>From b57eb713ef7d36b2fe10ec83a989ba1845e098b6 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 26 Oct 2010 11:02:25 -0500
Subject: [PATCH 2/2] staging: r8712u: Fix sparse message

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
 drivers/staging/rtl8712/TODO                  |    1 -
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c |    1 +
 drivers/staging/rtl8712/rtl871x_mp_ioctl.c    |    2 --
 drivers/staging/rtl8712/rtl871x_mp_ioctl.h    |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8712/TODO b/drivers/staging/rtl8712/TODO
index ed22b0b..d8dfe5b 100644
--- a/drivers/staging/rtl8712/TODO
+++ b/drivers/staging/rtl8712/TODO
@@ -3,7 +3,6 @@ TODO:
 - switch to use LIB80211
 - switch to use MAC80211
 - checkpatch.pl fixes - only a few remain
-- sparse fixes
 
 Please send any patches to Greg Kroah-Hartman <greg@kroah.com>,
 Larry Finger <Larry.Finger@lwfinger.net> and
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 1529239..f4353eb 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -27,6 +27,7 @@
  ******************************************************************************/
 
 #define _RTL871X_IOCTL_LINUX_C_
+#define _RTL871X_MP_IOCTL_C_
 
 #include "osdep_service.h"
 #include "drv_types.h"
diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
index d60aaa9..5eb461b 100644
--- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
+++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
@@ -26,8 +26,6 @@
  *
  ******************************************************************************/
 
-#define _RTL871X_MP_IOCTL_C_
-
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "mlme_osdep.h"
diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h b/drivers/staging/rtl8712/rtl871x_mp_ioctl.h
index 2225bd1..fdd2278 100644
--- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h
+++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.h
@@ -373,7 +373,7 @@ unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv);
 #ifdef _RTL871X_MP_IOCTL_C_ /* CAUTION!!! */
 /* This ifdef _MUST_ be left in!! */
 
-struct mp_ioctl_handler mp_ioctl_hdl[] = {
+static struct mp_ioctl_handler mp_ioctl_hdl[] = {
 	{sizeof(u32), oid_rt_pro_start_test_hdl,
 			     OID_RT_PRO_START_TEST},/*0*/
 	{sizeof(u32), oid_rt_pro_stop_test_hdl,
-- 
1.7.1

Re: [PATCH] staging: r8712u: Fix sparse message

[Greg KH]

On Thu, Oct 28, 2010 at 04:47:03PM -0500, Larry Finger wrote:
> >From b57eb713ef7d36b2fe10ec83a989ba1845e098b6 Mon Sep 17 00:00:00 2001
> From: Larry Finger <Larry.Finger@lwfinger.net>
> Date: Tue, 26 Oct 2010 11:02:25 -0500
> Subject: [PATCH 2/2] staging: r8712u: Fix sparse message
> 
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> ---
>  drivers/staging/rtl8712/TODO                  |    1 -
>  drivers/staging/rtl8712/rtl871x_ioctl_linux.c |    1 +
>  drivers/staging/rtl8712/rtl871x_mp_ioctl.c    |    2 --
>  drivers/staging/rtl8712/rtl871x_mp_ioctl.h    |    2 +-
>  4 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/rtl8712/TODO b/drivers/staging/rtl8712/TODO
> index ed22b0b..d8dfe5b 100644
> --- a/drivers/staging/rtl8712/TODO
> +++ b/drivers/staging/rtl8712/TODO
> @@ -3,7 +3,6 @@ TODO:
>  - switch to use LIB80211
>  - switch to use MAC80211
>  - checkpatch.pl fixes - only a few remain
> -- sparse fixes
>  
>  Please send any patches to Greg Kroah-Hartman <greg@kroah.com>,
>  Larry Finger <Larry.Finger@lwfinger.net> and

This part of the patch doesn't apply anymore, which is odd.

Anyway, care to redo it against linux-next and resend it?

thanks,

greg k-h

Re: [PATCH] staging: r8712u: Fix sparse message

[Larry Finger]

On 11/09/2010 05:57 PM, Greg KH wrote:
> On Thu, Oct 28, 2010 at 04:47:03PM -0500, Larry Finger wrote:
>> >From b57eb713ef7d36b2fe10ec83a989ba1845e098b6 Mon Sep 17 00:00:00 2001
>> From: Larry Finger <Larry.Finger@lwfinger.net>
>> Date: Tue, 26 Oct 2010 11:02:25 -0500
>> Subject: [PATCH 2/2] staging: r8712u: Fix sparse message
>>
>> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
>> ---
>>  drivers/staging/rtl8712/TODO                  |    1 -
>>  drivers/staging/rtl8712/rtl871x_ioctl_linux.c |    1 +
>>  drivers/staging/rtl8712/rtl871x_mp_ioctl.c    |    2 --
>>  drivers/staging/rtl8712/rtl871x_mp_ioctl.h    |    2 +-
>>  4 files changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/staging/rtl8712/TODO b/drivers/staging/rtl8712/TODO
>> index ed22b0b..d8dfe5b 100644
>> --- a/drivers/staging/rtl8712/TODO
>> +++ b/drivers/staging/rtl8712/TODO
>> @@ -3,7 +3,6 @@ TODO:
>>  - switch to use LIB80211
>>  - switch to use MAC80211
>>  - checkpatch.pl fixes - only a few remain
>> -- sparse fixes
>>  
>>  Please send any patches to Greg Kroah-Hartman <greg@kroah.com>,
>>  Larry Finger <Larry.Finger@lwfinger.net> and
> 
> This part of the patch doesn't apply anymore, which is odd.
> 
> Anyway, care to redo it against linux-next and resend it?

My fault. I have some local changes to use external firmware, and I applied
things in the wrong order. The correct patch is on the way.

Larry