aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-18 05:39:39 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-18 05:39:39 -0400
commit49997d75152b3d23c53b0fa730599f2f74c92c65 (patch)
tree46e93126170d02cfec9505172e545732c1b69656 /drivers/net/wireless/rt2x00
parenta0c80b80e0fb48129e4e9d6a9ede914f9ff1850d (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: Documentation/powerpc/booting-without-of.txt drivers/atm/Makefile drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/8021q/vlan.c net/iucv/iucv.c
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00.h4
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00pci.h2
-rw-r--r--drivers/net/wireless/rt2x00/rt61pci.c4
-rw-r--r--drivers/net/wireless/rt2x00/rt73usb.c6
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 9fab0df18c3c..07b03b3c7ef1 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -487,8 +487,8 @@ struct rt2x00lib_ops {
487 */ 487 */
488 int (*probe_hw) (struct rt2x00_dev *rt2x00dev); 488 int (*probe_hw) (struct rt2x00_dev *rt2x00dev);
489 char *(*get_firmware_name) (struct rt2x00_dev *rt2x00dev); 489 char *(*get_firmware_name) (struct rt2x00_dev *rt2x00dev);
490 u16 (*get_firmware_crc) (void *data, const size_t len); 490 u16 (*get_firmware_crc) (const void *data, const size_t len);
491 int (*load_firmware) (struct rt2x00_dev *rt2x00dev, void *data, 491 int (*load_firmware) (struct rt2x00_dev *rt2x00dev, const void *data,
492 const size_t len); 492 const size_t len);
493 493
494 /* 494 /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h
index 50c6df4f81db..80bf97c03e2d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.h
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.h
@@ -82,7 +82,7 @@ static inline void rt2x00pci_register_write(struct rt2x00_dev *rt2x00dev,
82static inline void 82static inline void
83rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev, 83rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,
84 const unsigned long offset, 84 const unsigned long offset,
85 void *value, const u16 length) 85 const void *value, const u16 length)
86{ 86{
87 memcpy_toio(rt2x00dev->csr.base + offset, value, length); 87 memcpy_toio(rt2x00dev->csr.base + offset, value, length);
88} 88}
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 70ef7bf434ab..f7c1f92c1448 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -926,7 +926,7 @@ static char *rt61pci_get_firmware_name(struct rt2x00_dev *rt2x00dev)
926 return fw_name; 926 return fw_name;
927} 927}
928 928
929static u16 rt61pci_get_firmware_crc(void *data, const size_t len) 929static u16 rt61pci_get_firmware_crc(const void *data, const size_t len)
930{ 930{
931 u16 crc; 931 u16 crc;
932 932
@@ -943,7 +943,7 @@ static u16 rt61pci_get_firmware_crc(void *data, const size_t len)
943 return crc; 943 return crc;
944} 944}
945 945
946static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, void *data, 946static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, const void *data,
947 const size_t len) 947 const size_t len)
948{ 948{
949 int i; 949 int i;
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 34c6ff27afc4..d383735ab8f2 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -867,7 +867,7 @@ static char *rt73usb_get_firmware_name(struct rt2x00_dev *rt2x00dev)
867 return FIRMWARE_RT2571; 867 return FIRMWARE_RT2571;
868} 868}
869 869
870static u16 rt73usb_get_firmware_crc(void *data, const size_t len) 870static u16 rt73usb_get_firmware_crc(const void *data, const size_t len)
871{ 871{
872 u16 crc; 872 u16 crc;
873 873
@@ -884,13 +884,13 @@ static u16 rt73usb_get_firmware_crc(void *data, const size_t len)
884 return crc; 884 return crc;
885} 885}
886 886
887static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev, void *data, 887static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev, const void *data,
888 const size_t len) 888 const size_t len)
889{ 889{
890 unsigned int i; 890 unsigned int i;
891 int status; 891 int status;
892 u32 reg; 892 u32 reg;
893 char *ptr = data; 893 const char *ptr = data;
894 char *cache; 894 char *cache;
895 int buflen; 895 int buflen;
896 896