Re: [ath5k-devel] [PATCH] ath5k: Remove AHB bus support.

2014-02-08 Thread Paul Bolle
Luis R. Rodriguez schreef op ma 13-05-2013 om 10:43 [-0700]:
 NACK, looking forward to the linux-mips patches, in the future however
 we want to avoid these type of placeholder patches.

This thread was (likely) started when I submitted this patch (to remove
AHB bus support) during the v3.10 development cycle. We're now at
v3.14-rc1, and the patch still applies (perhaps requiring some trivial
context changes).

Should I resubmit?


Paul Bolle

___
ath5k-devel mailing list
ath5k-devel@lists.ath5k.org
https://lists.ath5k.org/mailman/listinfo/ath5k-devel


Re: [ath5k-devel] [PATCH] ath5k: Remove AHB bus support.

2013-05-13 Thread Adrian Chadd
... is anyone using this on openwrt?




Adrian

On 13 May 2013 08:03, Paul Bolle pebo...@tiscali.nl wrote:
 AHB bus support was added in v2.6.38, through commit a0b907ee2a (ath5k:
 Add AHB bus support.). That code can only be build if the Kconfig
 symbol ATHEROS_AR231X is set. But that symbol has never been added to
 the tree. So AHB bus support has always been dead code.

 Let's remove all code that depends on ATHEROS_AR231X. If that symbol
 ever gets added to the tree the AHB bus support can be re-added too.

 Signed-off-by: Paul Bolle pebo...@tiscali.nl
 ---
 0) Compile tested (I do not think I have hardware that use the ath5k
 driver).

 1) I mentioned the missing ATHEROS_AR231X symbol three times before (in
 August 2011, in July 2012 and in March 2103). Nobody stepped forward to
 tell me they were actually working on adding that symbol somehow. So
 let's see how people react when I submit a patch to remove the (dead)
 AHB bus support.

  drivers/net/wireless/ath/ath5k/Kconfig  |  14 +-
  drivers/net/wireless/ath/ath5k/Makefile |   1 -
  drivers/net/wireless/ath/ath5k/ahb.c| 239 
 
  drivers/net/wireless/ath/ath5k/ath5k.h  |  28 
  drivers/net/wireless/ath/ath5k/base.c   |  14 --
  drivers/net/wireless/ath/ath5k/led.c|   6 -
  6 files changed, 3 insertions(+), 299 deletions(-)
  delete mode 100644 drivers/net/wireless/ath/ath5k/ahb.c

 diff --git a/drivers/net/wireless/ath/ath5k/Kconfig 
 b/drivers/net/wireless/ath/ath5k/Kconfig
 index c9f81a3..93caf8e68 100644
 --- a/drivers/net/wireless/ath/ath5k/Kconfig
 +++ b/drivers/net/wireless/ath/ath5k/Kconfig
 @@ -1,13 +1,12 @@
  config ATH5K
 tristate Atheros 5xxx wireless cards support
 -   depends on (PCI || ATHEROS_AR231X)  MAC80211
 +   depends on PCI  MAC80211
 select ATH_COMMON
 select MAC80211_LEDS
 select LEDS_CLASS
 select NEW_LEDS
 select AVERAGE
 -   select ATH5K_AHB if (ATHEROS_AR231X  !PCI)
 -   select ATH5K_PCI if (!ATHEROS_AR231X  PCI)
 +   select ATH5K_PCI
 ---help---
   This module adds support for wireless adapters based on
   Atheros 5xxx chipset.
 @@ -52,16 +51,9 @@ config ATH5K_TRACER

   If unsure, say N.

 -config ATH5K_AHB
 -   bool Atheros 5xxx AHB bus support
 -   depends on (ATHEROS_AR231X  !PCI)
 -   ---help---
 - This adds support for WiSoC type chipsets of the 5xxx Atheros
 - family.
 -
  config ATH5K_PCI
 bool Atheros 5xxx PCI bus support
 -   depends on (!ATHEROS_AR231X  PCI)
 +   depends on PCI
 ---help---
   This adds support for PCI type chipsets of the 5xxx Atheros
   family.
 diff --git a/drivers/net/wireless/ath/ath5k/Makefile 
 b/drivers/net/wireless/ath/ath5k/Makefile
 index 1b3a34f..51e2d86 100644
 --- a/drivers/net/wireless/ath/ath5k/Makefile
 +++ b/drivers/net/wireless/ath/ath5k/Makefile
 @@ -17,6 +17,5 @@ ath5k-y   += ani.o
  ath5k-y+= sysfs.o
  ath5k-y+= mac80211-ops.o
  ath5k-$(CONFIG_ATH5K_DEBUG)+= debug.o
 -ath5k-$(CONFIG_ATH5K_AHB)  += ahb.o
  ath5k-$(CONFIG_ATH5K_PCI)  += pci.o
  obj-$(CONFIG_ATH5K)+= ath5k.o
 diff --git a/drivers/net/wireless/ath/ath5k/ahb.c 
 b/drivers/net/wireless/ath/ath5k/ahb.c
 deleted file mode 100644
 index 8e8bcc7a..000
 --- a/drivers/net/wireless/ath/ath5k/ahb.c
 +++ /dev/null
 @@ -1,239 +0,0 @@
 -/*
 - * Copyright (c) 2008-2009 Atheros Communications Inc.
 - * Copyright (c) 2009 Gabor Juhos juh...@openwrt.org
 - * Copyright (c) 2009 Imre Kaloz ka...@openwrt.org
 - *
 - * Permission to use, copy, modify, and/or distribute this software for any
 - * purpose with or without fee is hereby granted, provided that the above
 - * copyright notice and this permission notice appear in all copies.
 - *
 - * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 - */
 -
 -#include linux/nl80211.h
 -#include linux/platform_device.h
 -#include linux/etherdevice.h
 -#include linux/export.h
 -#include ar231x_platform.h
 -#include ath5k.h
 -#include debug.h
 -#include base.h
 -#include reg.h
 -
 -/* return bus cachesize in 4B word units */
 -static void ath5k_ahb_read_cachesize(struct ath_common *common, int *csz)
 -{
 -   *csz = L1_CACHE_BYTES  2;
 -}
 -
 -static bool
 -ath5k_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data)
 -{
 -   struct ath5k_hw *ah = common-priv;
 -   struct platform_device 

[ath5k-devel] [PATCH] ath5k: Remove AHB bus support.

2013-05-13 Thread Paul Bolle
AHB bus support was added in v2.6.38, through commit a0b907ee2a (ath5k:
Add AHB bus support.). That code can only be build if the Kconfig
symbol ATHEROS_AR231X is set. But that symbol has never been added to
the tree. So AHB bus support has always been dead code.

Let's remove all code that depends on ATHEROS_AR231X. If that symbol
ever gets added to the tree the AHB bus support can be re-added too.

Signed-off-by: Paul Bolle pebo...@tiscali.nl
---
0) Compile tested (I do not think I have hardware that use the ath5k
driver).

1) I mentioned the missing ATHEROS_AR231X symbol three times before (in
August 2011, in July 2012 and in March 2103). Nobody stepped forward to
tell me they were actually working on adding that symbol somehow. So
let's see how people react when I submit a patch to remove the (dead)
AHB bus support.

 drivers/net/wireless/ath/ath5k/Kconfig  |  14 +-
 drivers/net/wireless/ath/ath5k/Makefile |   1 -
 drivers/net/wireless/ath/ath5k/ahb.c| 239 
 drivers/net/wireless/ath/ath5k/ath5k.h  |  28 
 drivers/net/wireless/ath/ath5k/base.c   |  14 --
 drivers/net/wireless/ath/ath5k/led.c|   6 -
 6 files changed, 3 insertions(+), 299 deletions(-)
 delete mode 100644 drivers/net/wireless/ath/ath5k/ahb.c

diff --git a/drivers/net/wireless/ath/ath5k/Kconfig 
b/drivers/net/wireless/ath/ath5k/Kconfig
index c9f81a3..93caf8e68 100644
--- a/drivers/net/wireless/ath/ath5k/Kconfig
+++ b/drivers/net/wireless/ath/ath5k/Kconfig
@@ -1,13 +1,12 @@
 config ATH5K
tristate Atheros 5xxx wireless cards support
-   depends on (PCI || ATHEROS_AR231X)  MAC80211
+   depends on PCI  MAC80211
select ATH_COMMON
select MAC80211_LEDS
select LEDS_CLASS
select NEW_LEDS
select AVERAGE
-   select ATH5K_AHB if (ATHEROS_AR231X  !PCI)
-   select ATH5K_PCI if (!ATHEROS_AR231X  PCI)
+   select ATH5K_PCI
---help---
  This module adds support for wireless adapters based on
  Atheros 5xxx chipset.
@@ -52,16 +51,9 @@ config ATH5K_TRACER
 
  If unsure, say N.
 
-config ATH5K_AHB
-   bool Atheros 5xxx AHB bus support
-   depends on (ATHEROS_AR231X  !PCI)
-   ---help---
- This adds support for WiSoC type chipsets of the 5xxx Atheros
- family.
-
 config ATH5K_PCI
bool Atheros 5xxx PCI bus support
-   depends on (!ATHEROS_AR231X  PCI)
+   depends on PCI
---help---
  This adds support for PCI type chipsets of the 5xxx Atheros
  family.
diff --git a/drivers/net/wireless/ath/ath5k/Makefile 
b/drivers/net/wireless/ath/ath5k/Makefile
index 1b3a34f..51e2d86 100644
--- a/drivers/net/wireless/ath/ath5k/Makefile
+++ b/drivers/net/wireless/ath/ath5k/Makefile
@@ -17,6 +17,5 @@ ath5k-y   += ani.o
 ath5k-y+= sysfs.o
 ath5k-y+= mac80211-ops.o
 ath5k-$(CONFIG_ATH5K_DEBUG)+= debug.o
-ath5k-$(CONFIG_ATH5K_AHB)  += ahb.o
 ath5k-$(CONFIG_ATH5K_PCI)  += pci.o
 obj-$(CONFIG_ATH5K)+= ath5k.o
diff --git a/drivers/net/wireless/ath/ath5k/ahb.c 
b/drivers/net/wireless/ath/ath5k/ahb.c
deleted file mode 100644
index 8e8bcc7a..000
--- a/drivers/net/wireless/ath/ath5k/ahb.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 2008-2009 Atheros Communications Inc.
- * Copyright (c) 2009 Gabor Juhos juh...@openwrt.org
- * Copyright (c) 2009 Imre Kaloz ka...@openwrt.org
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include linux/nl80211.h
-#include linux/platform_device.h
-#include linux/etherdevice.h
-#include linux/export.h
-#include ar231x_platform.h
-#include ath5k.h
-#include debug.h
-#include base.h
-#include reg.h
-
-/* return bus cachesize in 4B word units */
-static void ath5k_ahb_read_cachesize(struct ath_common *common, int *csz)
-{
-   *csz = L1_CACHE_BYTES  2;
-}
-
-static bool
-ath5k_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data)
-{
-   struct ath5k_hw *ah = common-priv;
-   struct platform_device *pdev = to_platform_device(ah-dev);
-   struct ar231x_board_config *bcfg = pdev-dev.platform_data;
-   u16 *eeprom, *eeprom_end;
-
-
-
-   bcfg = pdev-dev.platform_data;
-   eeprom = (u16 *) bcfg-radio;
-  

Re: [ath5k-devel] [PATCH] ath5k: Remove AHB bus support.

2013-05-13 Thread Adrian Chadd
On 13 May 2013 09:39, Jonathan Bither jonbit...@gmail.com wrote:

 ... is anyone using this on openwrt?

 I am.
 I am also reworking AR2131X drivers and will submit a patch to linux-mips
 shortly.

Sweet. Someone say NACK then? :)



Adrian
___
ath5k-devel mailing list
ath5k-devel@lists.ath5k.org
https://lists.ath5k.org/mailman/listinfo/ath5k-devel


Re: [ath5k-devel] [PATCH] ath5k: Remove AHB bus support.

2013-05-13 Thread Luis R. Rodriguez
On Mon, May 13, 2013 at 10:09 AM, Adrian Chadd adr...@freebsd.org wrote:
 On 13 May 2013 09:39, Jonathan Bither jonbit...@gmail.com wrote:

 ... is anyone using this on openwrt?

 I am.
 I am also reworking AR2131X drivers and will submit a patch to linux-mips
 shortly.

 Sweet. Someone say NACK then? :)

NACK, looking forward to the linux-mips patches, in the future however
we want to avoid these type of placeholder patches.

  Luis
___
ath5k-devel mailing list
ath5k-devel@lists.ath5k.org
https://lists.ath5k.org/mailman/listinfo/ath5k-devel


Re: [ath5k-devel] [PATCH] ath5k: Remove AHB bus support.

2013-05-13 Thread Oleksij Rempel
Hmm... i'm working right now to make ar231x device work with upstream
sources. First think is boot loader. There are is a ar231x fork of 
redboot, but i decided to go barebox. See:
https://github.com/olerem/barebox/commits/atheros
there one more barebox dev on it, so i think we will get it.

Next step will be to check why ar231x patches are not in upstream 
kernel. After i ported ar231x-eth driver to barebox, i can assume why it 
is not included - it need some more work. Or may be there are other reasons.

Currently i do not know how AHB bus related to ATHEROS_AR231X.

Am 13.05.2013 17:03, schrieb Paul Bolle:
 AHB bus support was added in v2.6.38, through commit a0b907ee2a (ath5k:
 Add AHB bus support.). That code can only be build if the Kconfig
 symbol ATHEROS_AR231X is set. But that symbol has never been added to
 the tree. So AHB bus support has always been dead code.

 Let's remove all code that depends on ATHEROS_AR231X. If that symbol
 ever gets added to the tree the AHB bus support can be re-added too.

 Signed-off-by: Paul Bolle pebo...@tiscali.nl
 ---
 0) Compile tested (I do not think I have hardware that use the ath5k
 driver).

 1) I mentioned the missing ATHEROS_AR231X symbol three times before (in
 August 2011, in July 2012 and in March 2103). Nobody stepped forward to
 tell me they were actually working on adding that symbol somehow. So
 let's see how people react when I submit a patch to remove the (dead)
 AHB bus support.

   drivers/net/wireless/ath/ath5k/Kconfig  |  14 +-
   drivers/net/wireless/ath/ath5k/Makefile |   1 -
   drivers/net/wireless/ath/ath5k/ahb.c| 239 
 
   drivers/net/wireless/ath/ath5k/ath5k.h  |  28 
   drivers/net/wireless/ath/ath5k/base.c   |  14 --
   drivers/net/wireless/ath/ath5k/led.c|   6 -
   6 files changed, 3 insertions(+), 299 deletions(-)
   delete mode 100644 drivers/net/wireless/ath/ath5k/ahb.c

 diff --git a/drivers/net/wireless/ath/ath5k/Kconfig 
 b/drivers/net/wireless/ath/ath5k/Kconfig
 index c9f81a3..93caf8e68 100644
 --- a/drivers/net/wireless/ath/ath5k/Kconfig
 +++ b/drivers/net/wireless/ath/ath5k/Kconfig
 @@ -1,13 +1,12 @@
   config ATH5K
   tristate Atheros 5xxx wireless cards support
 - depends on (PCI || ATHEROS_AR231X)  MAC80211
 + depends on PCI  MAC80211
   select ATH_COMMON
   select MAC80211_LEDS
   select LEDS_CLASS
   select NEW_LEDS
   select AVERAGE
 - select ATH5K_AHB if (ATHEROS_AR231X  !PCI)
 - select ATH5K_PCI if (!ATHEROS_AR231X  PCI)
 + select ATH5K_PCI
   ---help---
 This module adds support for wireless adapters based on
 Atheros 5xxx chipset.
 @@ -52,16 +51,9 @@ config ATH5K_TRACER

 If unsure, say N.

 -config ATH5K_AHB
 - bool Atheros 5xxx AHB bus support
 - depends on (ATHEROS_AR231X  !PCI)
 - ---help---
 -   This adds support for WiSoC type chipsets of the 5xxx Atheros
 -   family.
 -
   config ATH5K_PCI
   bool Atheros 5xxx PCI bus support
 - depends on (!ATHEROS_AR231X  PCI)
 + depends on PCI
   ---help---
 This adds support for PCI type chipsets of the 5xxx Atheros
 family.
 diff --git a/drivers/net/wireless/ath/ath5k/Makefile 
 b/drivers/net/wireless/ath/ath5k/Makefile
 index 1b3a34f..51e2d86 100644
 --- a/drivers/net/wireless/ath/ath5k/Makefile
 +++ b/drivers/net/wireless/ath/ath5k/Makefile
 @@ -17,6 +17,5 @@ ath5k-y += ani.o
   ath5k-y += sysfs.o
   ath5k-y += mac80211-ops.o
   ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o
 -ath5k-$(CONFIG_ATH5K_AHB)+= ahb.o
   ath5k-$(CONFIG_ATH5K_PCI)   += pci.o
   obj-$(CONFIG_ATH5K) += ath5k.o
 diff --git a/drivers/net/wireless/ath/ath5k/ahb.c 
 b/drivers/net/wireless/ath/ath5k/ahb.c
 deleted file mode 100644
 index 8e8bcc7a..000
 --- a/drivers/net/wireless/ath/ath5k/ahb.c
 +++ /dev/null
 @@ -1,239 +0,0 @@
 -/*
 - * Copyright (c) 2008-2009 Atheros Communications Inc.
 - * Copyright (c) 2009 Gabor Juhos juh...@openwrt.org
 - * Copyright (c) 2009 Imre Kaloz ka...@openwrt.org
 - *
 - * Permission to use, copy, modify, and/or distribute this software for any
 - * purpose with or without fee is hereby granted, provided that the above
 - * copyright notice and this permission notice appear in all copies.
 - *
 - * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 - */
 -
 -#include linux/nl80211.h
 -#include linux/platform_device.h
 -#include linux/etherdevice.h
 -#include 

Re: [ath5k-devel] [PATCH] ath5k: Remove AHB bus support.

2013-05-13 Thread Jonathan Bither


On 05/13/2013 11:11 AM, Adrian Chadd wrote:
 ... is anyone using this on openwrt?

I am.
I am also reworking AR2131X drivers and will submit a patch to 
linux-mips shortly.



 Adrian

 On 13 May 2013 08:03, Paul Bolle pebo...@tiscali.nl wrote:
 AHB bus support was added in v2.6.38, through commit a0b907ee2a (ath5k:
 Add AHB bus support.). That code can only be build if the Kconfig
 symbol ATHEROS_AR231X is set. But that symbol has never been added to
 the tree. So AHB bus support has always been dead code.

 Let's remove all code that depends on ATHEROS_AR231X. If that symbol
 ever gets added to the tree the AHB bus support can be re-added too.

 Signed-off-by: Paul Bolle pebo...@tiscali.nl
 ---
 0) Compile tested (I do not think I have hardware that use the ath5k
 driver).

 1) I mentioned the missing ATHEROS_AR231X symbol three times before (in
 August 2011, in July 2012 and in March 2103). Nobody stepped forward to
 tell me they were actually working on adding that symbol somehow. So
 let's see how people react when I submit a patch to remove the (dead)
 AHB bus support.

   drivers/net/wireless/ath/ath5k/Kconfig  |  14 +-
   drivers/net/wireless/ath/ath5k/Makefile |   1 -
   drivers/net/wireless/ath/ath5k/ahb.c| 239 
 
   drivers/net/wireless/ath/ath5k/ath5k.h  |  28 
   drivers/net/wireless/ath/ath5k/base.c   |  14 --
   drivers/net/wireless/ath/ath5k/led.c|   6 -
   6 files changed, 3 insertions(+), 299 deletions(-)
   delete mode 100644 drivers/net/wireless/ath/ath5k/ahb.c

 diff --git a/drivers/net/wireless/ath/ath5k/Kconfig 
 b/drivers/net/wireless/ath/ath5k/Kconfig
 index c9f81a3..93caf8e68 100644
 --- a/drivers/net/wireless/ath/ath5k/Kconfig
 +++ b/drivers/net/wireless/ath/ath5k/Kconfig
 @@ -1,13 +1,12 @@
   config ATH5K
  tristate Atheros 5xxx wireless cards support
 -   depends on (PCI || ATHEROS_AR231X)  MAC80211
 +   depends on PCI  MAC80211
  select ATH_COMMON
  select MAC80211_LEDS
  select LEDS_CLASS
  select NEW_LEDS
  select AVERAGE
 -   select ATH5K_AHB if (ATHEROS_AR231X  !PCI)
 -   select ATH5K_PCI if (!ATHEROS_AR231X  PCI)
 +   select ATH5K_PCI
  ---help---
This module adds support for wireless adapters based on
Atheros 5xxx chipset.
 @@ -52,16 +51,9 @@ config ATH5K_TRACER

If unsure, say N.

 -config ATH5K_AHB
 -   bool Atheros 5xxx AHB bus support
 -   depends on (ATHEROS_AR231X  !PCI)
 -   ---help---
 - This adds support for WiSoC type chipsets of the 5xxx Atheros
 - family.
 -
   config ATH5K_PCI
  bool Atheros 5xxx PCI bus support
 -   depends on (!ATHEROS_AR231X  PCI)
 +   depends on PCI
  ---help---
This adds support for PCI type chipsets of the 5xxx Atheros
family.
 diff --git a/drivers/net/wireless/ath/ath5k/Makefile 
 b/drivers/net/wireless/ath/ath5k/Makefile
 index 1b3a34f..51e2d86 100644
 --- a/drivers/net/wireless/ath/ath5k/Makefile
 +++ b/drivers/net/wireless/ath/ath5k/Makefile
 @@ -17,6 +17,5 @@ ath5k-y   += ani.o
   ath5k-y+= sysfs.o
   ath5k-y+= mac80211-ops.o
   ath5k-$(CONFIG_ATH5K_DEBUG)+= debug.o
 -ath5k-$(CONFIG_ATH5K_AHB)  += ahb.o
   ath5k-$(CONFIG_ATH5K_PCI)  += pci.o
   obj-$(CONFIG_ATH5K)+= ath5k.o
 diff --git a/drivers/net/wireless/ath/ath5k/ahb.c 
 b/drivers/net/wireless/ath/ath5k/ahb.c
 deleted file mode 100644
 index 8e8bcc7a..000
 --- a/drivers/net/wireless/ath/ath5k/ahb.c
 +++ /dev/null
 @@ -1,239 +0,0 @@
 -/*
 - * Copyright (c) 2008-2009 Atheros Communications Inc.
 - * Copyright (c) 2009 Gabor Juhos juh...@openwrt.org
 - * Copyright (c) 2009 Imre Kaloz ka...@openwrt.org
 - *
 - * Permission to use, copy, modify, and/or distribute this software for any
 - * purpose with or without fee is hereby granted, provided that the above
 - * copyright notice and this permission notice appear in all copies.
 - *
 - * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 - */
 -
 -#include linux/nl80211.h
 -#include linux/platform_device.h
 -#include linux/etherdevice.h
 -#include linux/export.h
 -#include ar231x_platform.h
 -#include ath5k.h
 -#include debug.h
 -#include base.h
 -#include reg.h
 -
 -/* return bus cachesize in 4B word units */
 -static void ath5k_ahb_read_cachesize(struct ath_common *common, int *csz)
 -{
 -   *csz = L1_CACHE_BYTES  2;
 -}