diff options
author | David Woodhouse <dwmw2@infradead.org> | 2008-05-23 19:08:39 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-10 09:26:19 -0400 |
commit | f160ebcbeb6c9b79a770f22e14398158dac3de00 (patch) | |
tree | 8fa2e2825ef9b61863762800132bdd4574c3479a | |
parent | 45ef0bdb18a37bcf102e2a18c757227f8b192a36 (diff) |
rt2x00: treat firmware data as const
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00pci.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index b4bf1e09cf9a..a74e1a5c56fd 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
@@ -511,8 +511,8 @@ struct rt2x00lib_ops { | |||
511 | */ | 511 | */ |
512 | int (*probe_hw) (struct rt2x00_dev *rt2x00dev); | 512 | int (*probe_hw) (struct rt2x00_dev *rt2x00dev); |
513 | char *(*get_firmware_name) (struct rt2x00_dev *rt2x00dev); | 513 | char *(*get_firmware_name) (struct rt2x00_dev *rt2x00dev); |
514 | u16 (*get_firmware_crc) (void *data, const size_t len); | 514 | u16 (*get_firmware_crc) (const void *data, const size_t len); |
515 | int (*load_firmware) (struct rt2x00_dev *rt2x00dev, void *data, | 515 | int (*load_firmware) (struct rt2x00_dev *rt2x00dev, const void *data, |
516 | const size_t len); | 516 | const size_t len); |
517 | 517 | ||
518 | /* | 518 | /* |
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h index 9d1cdb99431c..b41967ecbf6d 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, | |||
82 | static inline void | 82 | static inline void |
83 | rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev, | 83 | rt2x00pci_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 14bc7b281659..bb78de5290cd 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -915,7 +915,7 @@ static char *rt61pci_get_firmware_name(struct rt2x00_dev *rt2x00dev) | |||
915 | return fw_name; | 915 | return fw_name; |
916 | } | 916 | } |
917 | 917 | ||
918 | static u16 rt61pci_get_firmware_crc(void *data, const size_t len) | 918 | static u16 rt61pci_get_firmware_crc(const void *data, const size_t len) |
919 | { | 919 | { |
920 | u16 crc; | 920 | u16 crc; |
921 | 921 | ||
@@ -932,7 +932,7 @@ static u16 rt61pci_get_firmware_crc(void *data, const size_t len) | |||
932 | return crc; | 932 | return crc; |
933 | } | 933 | } |
934 | 934 | ||
935 | static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, void *data, | 935 | static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, const void *data, |
936 | const size_t len) | 936 | const size_t len) |
937 | { | 937 | { |
938 | int i; | 938 | int i; |
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 83cc0147f698..d5a6c21235c8 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -856,7 +856,7 @@ static char *rt73usb_get_firmware_name(struct rt2x00_dev *rt2x00dev) | |||
856 | return FIRMWARE_RT2571; | 856 | return FIRMWARE_RT2571; |
857 | } | 857 | } |
858 | 858 | ||
859 | static u16 rt73usb_get_firmware_crc(void *data, const size_t len) | 859 | static u16 rt73usb_get_firmware_crc(const void *data, const size_t len) |
860 | { | 860 | { |
861 | u16 crc; | 861 | u16 crc; |
862 | 862 | ||
@@ -873,13 +873,13 @@ static u16 rt73usb_get_firmware_crc(void *data, const size_t len) | |||
873 | return crc; | 873 | return crc; |
874 | } | 874 | } |
875 | 875 | ||
876 | static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev, void *data, | 876 | static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev, const void *data, |
877 | const size_t len) | 877 | const size_t len) |
878 | { | 878 | { |
879 | unsigned int i; | 879 | unsigned int i; |
880 | int status; | 880 | int status; |
881 | u32 reg; | 881 | u32 reg; |
882 | char *ptr = data; | 882 | const char *ptr = data; |
883 | char *cache; | 883 | char *cache; |
884 | int buflen; | 884 | int buflen; |
885 | int timeout; | 885 | int timeout; |