rt2x00 eeprom_93cx6 split

PATCH New Ivo van Doorn 1 participant 1 message Dec 10, 2006

Subsystems (4)

Networking Network drivers Library code Networking drivers (wireless)

lore

Share & tools

lore

Ivo van Doorn

author

2006-12-10 13:18 UTC #0 lore raw

PATCH 1/1 rt2x00 eeprom_93cx6 split

This patch will move the eeprom_93cx6 module out of the rt2x00 and into the /lib folder. This will allow adm80211 driver to use the module as well.

This will also make sure the read_opcode and the word index are written to the chip in a single command.

Signed-off-by Ivo van Doorn <[email protected]>

---

drivers/net/wireless/d80211/rt2x00/Kconfig +0 -9

diff -rNU3 wireless-dev-eeprom/drivers/net/wireless/d80211/rt2x00/Kconfig wireless-dev-eeprom-93cx6/drivers/net/wireless/d80211/rt2x00/Kconfig
@@ -82,15 +82,6 @@
 	---help---
 	Enable debugging output.
 
-config EEPROM_93CX6
-	tristate "EEPROM 93CX6 support"
-	depends on RT2x00
-	---help---
-	This is an experimental driver for EEPROM chipsets 93c46 and 93c66.
-	These chipsets are found inside the Ralink wireless cards.
-
-	When compiled as a module, this driver will be called "eeprom_93c6.ko".
-
 config CRC_ITU_T
 	tristate "CRC ITU-T V.41 functions"
 	help

drivers/net/wireless/d80211/rt2x00/Makefile +0 -1

diff -rNU3 wireless-dev-eeprom/drivers/net/wireless/d80211/rt2x00/Makefile wireless-dev-eeprom-93cx6/drivers/net/wireless/d80211/rt2x00/Makefile
@@ -4,4 +4,3 @@
 obj-$(CONFIG_RT2500USB)		+= rt2500usb.o
 obj-$(CONFIG_RT73USB)		+= rt73usb.o
 obj-$(CONFIG_CRC_ITU_T)		+= crc-itu-t.o
-obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o

drivers/net/wireless/d80211/rt2x00/eeprom_93cx6.c +0 ~~-189~~

189 lines not on this page · raw message

drivers/net/wireless/d80211/rt2x00/eeprom_93cx6.h +0 ~~-90~~

90 lines not on this page · raw message

drivers/net/wireless/d80211/rt2x00/rt2400pci.c +1 -1

diff -rNU3 wireless-dev-eeprom/drivers/net/wireless/d80211/rt2x00/rt2400pci.c wireless-dev-eeprom-93cx6/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
@@ -35,6 +35,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
+#include <linux/eeprom_93cx6.h>
 
 #include <net/iw_handler.h>
 #include <net/d80211.h>

@@ -53,7 +54,6 @@
 #include "rt2x00.h"
 #include "rt2x00pci.h"
 #include "rt2400pci.h"
-#include "eeprom_93cx6.h"
 
 /*
  * Register access.

drivers/net/wireless/d80211/rt2x00/rt2500pci.c +1 -1

diff -rNU3 wireless-dev-eeprom/drivers/net/wireless/d80211/rt2x00/rt2500pci.c wireless-dev-eeprom-93cx6/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
@@ -35,6 +35,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
+#include <linux/eeprom_93cx6.h>
 
 #include <net/iw_handler.h>
 #include <net/d80211.h>

@@ -53,7 +54,6 @@
 #include "rt2x00.h"
 #include "rt2x00pci.h"
 #include "rt2500pci.h"
-#include "eeprom_93cx6.h"
 
 /*
  * Register access.

drivers/net/wireless/d80211/rt2x00/rt61pci.c +1 -1

diff -rNU3 wireless-dev-eeprom/drivers/net/wireless/d80211/rt2x00/rt61pci.c wireless-dev-eeprom-93cx6/drivers/net/wireless/d80211/rt2x00/rt61pci.c
@@ -35,6 +35,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
+#include <linux/eeprom_93cx6.h>
 #include <linux/firmware.h>
 
 #include <net/iw_handler.h>

@@ -56,7 +57,6 @@
 #include "rt2x00crc.h"
 #include "rt61pci.h"
 #include "crc-itu-t.h"
-#include "eeprom_93cx6.h"
 
 /*
  * Register access.

include/linux/eeprom_93cx6.h +70 -0

70 lines not on this page · raw message

lib/Kconfig +7 -0

diff -rNU3 wireless-dev-eeprom/lib/Kconfig wireless-dev-eeprom-93cx6/lib/Kconfig
@@ -38,6 +38,13 @@
 	  require M here.  See Castagnoli93.
 	  Module will be libcrc32c.
 
+config EEPROM_93CX6
+	tristate "EEPROM 93CX6 support"
+	---help---
+	This is a driver for the EEPROM chipsets 93c46 and 93c66.
+
+	When compiled as a module, this driver will be called "eeprom_93c6.ko".
+
 config AUDIT_GENERIC
 	bool
 	depends on AUDIT && !AUDIT_ARCH

lib/Makefile +2 -0

diff -rNU3 wireless-dev-eeprom/lib/Makefile wireless-dev-eeprom-93cx6/lib/Makefile
@@ -55,6 +55,8 @@
 
 obj-$(CONFIG_SWIOTLB) += swiotlb.o
 
+obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
+
 hostprogs-y	:= gen_crc32table
 clean-files	:= crc32table.h

lib/eeprom_93cx6.c +210 -0

210 lines not on this page · raw message