[PATCH] staging/wlan-ng: kill WLAN_CPU_FAMILY and WLAN_SYSARCH

[PATCH] staging/wlan-ng: kill WLAN_CPU_FAMILY and WLAN_SYSARCH

[Mike Frysinger]

The WLAN_CPU_FAMILY and WLAN_SYSARCH defines are used in all of three places
(two of which look pretty suspect), so just kill them off rather than
throwing up a pointless #error on processors that are not in the existing
list.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 drivers/staging/wlan-ng/prism2_cs.c   |    8 ---
 drivers/staging/wlan-ng/wlan_compat.h |   85 ++-------------------------------
 2 files changed, 4 insertions(+), 89 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2_cs.c b/drivers/staging/wlan-ng/prism2_cs.c
index 63ce565..e221b1d 100644
--- a/drivers/staging/wlan-ng/prism2_cs.c
+++ b/drivers/staging/wlan-ng/prism2_cs.c
@@ -4,14 +4,6 @@
 #include "prism2mib.c"
 #include "prism2sta.c"
 
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,21) )
-#if (WLAN_CPU_FAMILY == WLAN_Ix86)
-#ifndef CONFIG_ISA
-#warning "You may need to enable ISA support in your kernel."
-#endif
-#endif
-#endif
-
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) )
 static u_int	irq_mask = 0xdeb8;		/* Interrupt mask */
 static int	irq_list[4] = { -1 };		/* Interrupt list */
diff --git a/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h
index 59dfa8f..b0cc670 100644
--- a/drivers/staging/wlan-ng/wlan_compat.h
+++ b/drivers/staging/wlan-ng/wlan_compat.h
@@ -51,92 +51,14 @@
 /*=============================================================*/
 /*------ Establish Platform Identity --------------------------*/
 /*=============================================================*/
-/* Key macros: */
-/* WLAN_CPU_FAMILY */
-	#define WLAN_Ix86			1
-	#define WLAN_PPC			2
-	#define WLAN_Ix96			3
-	#define WLAN_ARM			4
-	#define WLAN_ALPHA			5
-	#define WLAN_MIPS			6
-	#define WLAN_HPPA			7
-	#define WLAN_SPARC			8
-	#define WLAN_SH    			9
-	#define WLAN_x86_64                     10
-/* WLAN_SYSARCH */
-	#define WLAN_PCAT			1
-	#define WLAN_MBX			2
-	#define WLAN_RPX			3
-	#define WLAN_LWARCH			4
-	#define WLAN_PMAC			5
-	#define WLAN_SKIFF			6
-	#define WLAN_BITSY			7
-	#define WLAN_ALPHAARCH			7
-	#define WLAN_MIPSARCH			9
-	#define WLAN_HPPAARCH			10
-	#define WLAN_SPARCARCH			11
-	#define WLAN_SHARCH   			12
 
 /* Note: the PLX HOSTIF above refers to some vendors implementations for */
 /*       PCI.  It's a PLX chip that is a PCI to PCMCIA adapter, but it   */
 /*       isn't a real PCMCIA host interface adapter providing all the    */
 /*       card&socket services.                                           */
 
-#if (defined(CONFIG_PPC) || defined(CONFIG_8xx) || defined(__powerpc__))
-#ifndef __ppc__
-#define __ppc__
-#endif
-#endif
-
 #if defined(__KERNEL__)
 
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-
-#if defined(__x86_64__)
-	#define WLAN_CPU_FAMILY		WLAN_x86_64
-	#define WLAN_SYSARCH		WLAN_PCAT
-#elif defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)
-	#define WLAN_CPU_FAMILY		WLAN_Ix86
-	#define WLAN_SYSARCH		WLAN_PCAT
-#elif defined(__ppc__)
-	#define WLAN_CPU_FAMILY		WLAN_PPC
-	#if defined(CONFIG_MBX)
-		#define WLAN_SYSARCH	WLAN_MBX
-	#elif defined(CONFIG_RPXLITE)
-		#define WLAN_SYSARCH	WLAN_RPX
-	#elif defined(CONFIG_RPXCLASSIC)
-		#define WLAN_SYSARCH	WLAN_RPX
-	#else
-		#define WLAN_SYSARCH	WLAN_PMAC
-	#endif
-#elif defined(__arm__)
-	#define WLAN_CPU_FAMILY		WLAN_ARM
-	#define WLAN_SYSARCH		WLAN_SKIFF
-#elif defined(__alpha__)
-	#define WLAN_CPU_FAMILY		WLAN_ALPHA
-	#define WLAN_SYSARCH		WLAN_ALPHAARCH
-#elif defined(__mips__)
-	#define WLAN_CPU_FAMILY		WLAN_MIPS
-	#define WLAN_SYSARCH		WLAN_MIPSARCH
-#elif defined(__hppa__)
-	#define WLAN_CPU_FAMILY		WLAN_HPPA
-	#define WLAN_SYSARCH		WLAN_HPPAARCH
-#elif defined(__sparc__)
-        #define WLAN_CPU_FAMILY         WLAN_SPARC
-        #define WLAN_SYSARCH            WLAN_SPARC
-#elif defined(__sh__)
-        #define WLAN_CPU_FAMILY         WLAN_SH
-        #define WLAN_SYSARCH            WLAN_SHARCH
-        #ifndef __LITTLE_ENDIAN__
-        #define __LITTLE_ENDIAN__
-        #endif
-#else
-	#error "No CPU identified!"
-#endif
-#endif /* __KERNEL__ */
-
 /*
    Some big endian machines implicitly do all I/O in little endian mode.
 
@@ -150,7 +72,8 @@
 
 #if defined(WLAN_HOSTIF)
 #if ((WLAN_HOSTIF == WLAN_PCI) || (WLAN_HOSTIF == WLAN_PLX))
-#if ((WLAN_SYSARCH == WLAN_SKIFF) || (WLAN_SYSARCH == WLAN_PMAC) || (WLAN_SYSARCH == WLAN_SPARC))
+#if defined(__arm__) || defined(__sparc__) || \
+    (defined(__powerpc__) && !defined(CONFIG_MBX) && !defined(CONFIG_RPXLITE) && !defined(CONFIG_RPXCLASSIC))
 #define REVERSE_ENDIAN
 #endif
 #endif
@@ -692,11 +615,11 @@ typedef u32 pm_message_t;
 #define host2ieee16(n)	__cpu_to_le16(n)
 #define host2ieee32(n)	__cpu_to_le32(n)
 
-#if (WLAN_CPU_FAMILY != WLAN_MIPS)
+#if !defined(__mips__)
 typedef UINT32 phys_t;
 #endif
 
-#if (WLAN_CPU_FAMILY == WLAN_PPC)
+#if defined(__powerpc__)
        #define wlan_inw(a)                     in_be16((unsigned short *)((a)+_IO_BASE))
        #define wlan_inw_le16_to_cpu(a)         inw((a))
        #define wlan_outw(v,a)                  out_be16((unsigned short *)((a)+_IO_BASE), (v))
-- 
1.6.0.3

Re: [PATCH] staging/wlan-ng: kill WLAN_CPU_FAMILY and WLAN_SYSARCH

[Greg KH]

On Wed, Nov 12, 2008 at 09:35:40AM -0500, Mike Frysinger wrote:
> The WLAN_CPU_FAMILY and WLAN_SYSARCH defines are used in all of three places
> (two of which look pretty suspect), so just kill them off rather than
> throwing up a pointless #error on processors that are not in the existing
> list.

Thanks, but this is already cleaned up in my tree with a patch from
someone else.

greg k-h

Re: [PATCH] staging/wlan-ng: kill WLAN_CPU_FAMILY and WLAN_SYSARCH

[Mike Frysinger]

On Wed, Nov 12, 2008 at 17:46, Greg KH wrote:
> On Wed, Nov 12, 2008 at 09:35:40AM -0500, Mike Frysinger wrote:
>> The WLAN_CPU_FAMILY and WLAN_SYSARCH defines are used in all of three places
>> (two of which look pretty suspect), so just kill them off rather than
>> throwing up a pointless #error on processors that are not in the existing
>> list.
>
> Thanks, but this is already cleaned up in my tree with a patch from
> someone else.

where ?  i looked in staging.git and that hasnt been touched in 2 months.
-mike

Re: [PATCH] staging/wlan-ng: kill WLAN_CPU_FAMILY and WLAN_SYSARCH

[J.R. Mauro]

On Wed, Nov 12, 2008 at 06:36:57PM -0500, Mike Frysinger wrote:
> On Wed, Nov 12, 2008 at 17:46, Greg KH wrote:
> > On Wed, Nov 12, 2008 at 09:35:40AM -0500, Mike Frysinger wrote:
> >> The WLAN_CPU_FAMILY and WLAN_SYSARCH defines are used in all of three places
> >> (two of which look pretty suspect), so just kill them off rather than
> >> throwing up a pointless #error on processors that are not in the existing
> >> list.
> >
> > Thanks, but this is already cleaned up in my tree with a patch from
> > someone else.
> 
> where ?  i looked in staging.git and that hasnt been touched in 2 months.
> -mike

Greg has been using patches.git, not staging.git

> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] staging/wlan-ng: kill WLAN_CPU_FAMILY and WLAN_SYSARCH

[Greg KH]

On Wed, Nov 12, 2008 at 06:36:57PM -0500, Mike Frysinger wrote:
> On Wed, Nov 12, 2008 at 17:46, Greg KH wrote:
> > On Wed, Nov 12, 2008 at 09:35:40AM -0500, Mike Frysinger wrote:
> >> The WLAN_CPU_FAMILY and WLAN_SYSARCH defines are used in all of three places
> >> (two of which look pretty suspect), so just kill them off rather than
> >> throwing up a pointless #error on processors that are not in the existing
> >> list.
> >
> > Thanks, but this is already cleaned up in my tree with a patch from
> > someone else.
> 
> where ?  i looked in staging.git and that hasnt been touched in 2 months.

It's at:
	http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-staging/

Sorry, I need to delete that old git tree, but it still contains a few
patches that haven't moved into the current tree for a variety of
reasons.

I've asked it to be picked up in the -next tree as well, so that will
also work for you.

thanks,

greg k-h