diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/atmel.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_sdio.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/p54/p54usb.c | 5 | ||||
-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 | ||||
-rw-r--r-- | drivers/net/wireless/zd1201.c | 2 |
10 files changed, 20 insertions, 19 deletions
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 438e63ecccf1..d1acef7e0b14 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -560,7 +560,7 @@ static const struct { | |||
560 | static void build_wpa_mib(struct atmel_private *priv); | 560 | static void build_wpa_mib(struct atmel_private *priv); |
561 | static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 561 | static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
562 | static void atmel_copy_to_card(struct net_device *dev, u16 dest, | 562 | static void atmel_copy_to_card(struct net_device *dev, u16 dest, |
563 | unsigned char *src, u16 len); | 563 | const unsigned char *src, u16 len); |
564 | static void atmel_copy_to_host(struct net_device *dev, unsigned char *dest, | 564 | static void atmel_copy_to_host(struct net_device *dev, unsigned char *dest, |
565 | u16 src, u16 len); | 565 | u16 src, u16 len); |
566 | static void atmel_set_gcr(struct net_device *dev, u16 mask); | 566 | static void atmel_set_gcr(struct net_device *dev, u16 mask); |
@@ -3853,7 +3853,7 @@ static int reset_atmel_card(struct net_device *dev) | |||
3853 | if (priv->card_type == CARD_TYPE_EEPROM) { | 3853 | if (priv->card_type == CARD_TYPE_EEPROM) { |
3854 | /* copy in firmware if needed */ | 3854 | /* copy in firmware if needed */ |
3855 | const struct firmware *fw_entry = NULL; | 3855 | const struct firmware *fw_entry = NULL; |
3856 | unsigned char *fw; | 3856 | const unsigned char *fw; |
3857 | int len = priv->firmware_length; | 3857 | int len = priv->firmware_length; |
3858 | if (!(fw = priv->firmware)) { | 3858 | if (!(fw = priv->firmware)) { |
3859 | if (priv->firmware_type == ATMEL_FW_TYPE_NONE) { | 3859 | if (priv->firmware_type == ATMEL_FW_TYPE_NONE) { |
@@ -4120,7 +4120,7 @@ static void atmel_writeAR(struct net_device *dev, u16 data) | |||
4120 | } | 4120 | } |
4121 | 4121 | ||
4122 | static void atmel_copy_to_card(struct net_device *dev, u16 dest, | 4122 | static void atmel_copy_to_card(struct net_device *dev, u16 dest, |
4123 | unsigned char *src, u16 len) | 4123 | const unsigned char *src, u16 len) |
4124 | { | 4124 | { |
4125 | int i; | 4125 | int i; |
4126 | atmel_writeAR(dev, dest); | 4126 | atmel_writeAR(dev, dest); |
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index 54280e292ea5..d075b448da94 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c | |||
@@ -122,7 +122,7 @@ static inline void if_cs_write16(struct if_cs_card *card, uint reg, u16 val) | |||
122 | static inline void if_cs_write16_rep( | 122 | static inline void if_cs_write16_rep( |
123 | struct if_cs_card *card, | 123 | struct if_cs_card *card, |
124 | uint reg, | 124 | uint reg, |
125 | void *buf, | 125 | const void *buf, |
126 | unsigned long count) | 126 | unsigned long count) |
127 | { | 127 | { |
128 | if (debug_output) | 128 | if (debug_output) |
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index 51f664bbee9d..3dd537be87d8 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c | |||
@@ -392,7 +392,7 @@ static int if_sdio_prog_helper(struct if_sdio_card *card) | |||
392 | unsigned long timeout; | 392 | unsigned long timeout; |
393 | u8 *chunk_buffer; | 393 | u8 *chunk_buffer; |
394 | u32 chunk_size; | 394 | u32 chunk_size; |
395 | u8 *firmware; | 395 | const u8 *firmware; |
396 | size_t size; | 396 | size_t size; |
397 | 397 | ||
398 | lbs_deb_enter(LBS_DEB_SDIO); | 398 | lbs_deb_enter(LBS_DEB_SDIO); |
@@ -508,7 +508,7 @@ static int if_sdio_prog_real(struct if_sdio_card *card) | |||
508 | unsigned long timeout; | 508 | unsigned long timeout; |
509 | u8 *chunk_buffer; | 509 | u8 *chunk_buffer; |
510 | u32 chunk_size; | 510 | u32 chunk_size; |
511 | u8 *firmware; | 511 | const u8 *firmware; |
512 | size_t size, req_size; | 512 | size_t size, req_size; |
513 | 513 | ||
514 | lbs_deb_enter(LBS_DEB_SDIO); | 514 | lbs_deb_enter(LBS_DEB_SDIO); |
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 36288b29abf7..4dcd4092e0f0 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c | |||
@@ -293,7 +293,7 @@ static void if_usb_disconnect(struct usb_interface *intf) | |||
293 | static int if_usb_send_fw_pkt(struct if_usb_card *cardp) | 293 | static int if_usb_send_fw_pkt(struct if_usb_card *cardp) |
294 | { | 294 | { |
295 | struct fwdata *fwdata = cardp->ep_out_buf; | 295 | struct fwdata *fwdata = cardp->ep_out_buf; |
296 | uint8_t *firmware = cardp->fw->data; | 296 | const uint8_t *firmware = cardp->fw->data; |
297 | 297 | ||
298 | /* If we got a CRC failure on the last block, back | 298 | /* If we got a CRC failure on the last block, back |
299 | up and retry it */ | 299 | up and retry it */ |
@@ -746,7 +746,7 @@ static int if_usb_issue_boot_command(struct if_usb_card *cardp, int ivalue) | |||
746 | * len image length | 746 | * len image length |
747 | * @return 0 or -1 | 747 | * @return 0 or -1 |
748 | */ | 748 | */ |
749 | static int check_fwfile_format(uint8_t *data, uint32_t totlen) | 749 | static int check_fwfile_format(const uint8_t *data, uint32_t totlen) |
750 | { | 750 | { |
751 | uint32_t bincmd, exit; | 751 | uint32_t bincmd, exit; |
752 | uint32_t blksize, offset, len; | 752 | uint32_t blksize, offset, len; |
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 1610a7308c1d..815c095ef797 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c | |||
@@ -376,7 +376,8 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev) | |||
376 | const struct firmware *fw_entry = NULL; | 376 | const struct firmware *fw_entry = NULL; |
377 | int err, alen; | 377 | int err, alen; |
378 | u8 carry = 0; | 378 | u8 carry = 0; |
379 | u8 *buf, *tmp, *data; | 379 | u8 *buf, *tmp; |
380 | const u8 *data; | ||
380 | unsigned int left, remains, block_size; | 381 | unsigned int left, remains, block_size; |
381 | struct x2_header *hdr; | 382 | struct x2_header *hdr; |
382 | unsigned long timeout; | 383 | unsigned long timeout; |
@@ -523,7 +524,7 @@ static int p54u_upload_firmware_net2280(struct ieee80211_hw *dev) | |||
523 | void *buf; | 524 | void *buf; |
524 | __le32 reg; | 525 | __le32 reg; |
525 | unsigned int remains, offset; | 526 | unsigned int remains, offset; |
526 | u8 *data; | 527 | const u8 *data; |
527 | 528 | ||
528 | buf = kmalloc(512, GFP_KERNEL); | 529 | buf = kmalloc(512, GFP_KERNEL); |
529 | if (!buf) { | 530 | if (!buf) { |
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 c3afb5cbe807..580f90b63de7 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 46e9e081fbf1..6a62d6bb96fe 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; |
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index d5c0c66188ca..78baa0f7926d 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c | |||
@@ -49,7 +49,7 @@ MODULE_DEVICE_TABLE(usb, zd1201_table); | |||
49 | static int zd1201_fw_upload(struct usb_device *dev, int apfw) | 49 | static int zd1201_fw_upload(struct usb_device *dev, int apfw) |
50 | { | 50 | { |
51 | const struct firmware *fw_entry; | 51 | const struct firmware *fw_entry; |
52 | char *data; | 52 | const char *data; |
53 | unsigned long len; | 53 | unsigned long len; |
54 | int err; | 54 | int err; |
55 | unsigned char ret; | 55 | unsigned char ret; |