diff options
author | David Woodhouse <dwmw2@infradead.org> | 2008-05-23 13:37:51 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-10 09:25:57 -0400 |
commit | 6dfff895fa33b8576f82a38cee8abe5f73561e24 (patch) | |
tree | cd03327d3cda61e244193a2328a2d46542749ec9 | |
parent | 6329d3021bcfa9038621e6e917d98929421d8ec8 (diff) |
libertas: treat firmware data as const
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-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 |
3 files changed, 5 insertions, 5 deletions
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; |