diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-05-24 00:05:45 +0100 | 
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-10 14:26:15 +0100 | 
| commit | 0bc202e0fd84b8c8d042bdf9f0995e1e47bdbf59 (patch) | |
| tree | 697225daea137152e1aa63bc3d46843438752dae /drivers | |
| parent | 3b216d186c6df2642b397dbb67fbb7884ead0d88 (diff) | |
aic94xx: treat firmware data as const
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_sds.c | 12 | ||||
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_sds.h | 4 | ||||
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_seq.c | 7 | 
3 files changed, 12 insertions, 11 deletions
| diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c index 4446e3d584dc..8630a75b2872 100644 --- a/drivers/scsi/aic94xx/aic94xx_sds.c +++ b/drivers/scsi/aic94xx/aic94xx_sds.c @@ -1093,9 +1093,9 @@ out:   * @bytes_to_verify: total bytes to verify   */  int asd_verify_flash_seg(struct asd_ha_struct *asd_ha, -		void *src, u32 dest_offset, u32 bytes_to_verify) +			 const void *src, u32 dest_offset, u32 bytes_to_verify)  { -	u8 *src_buf; +	const u8 *src_buf;  	u8 flash_char;  	int err;  	u32 nv_offset, reg, i; @@ -1105,7 +1105,7 @@ int asd_verify_flash_seg(struct asd_ha_struct *asd_ha,  	err = FLASH_OK;  	nv_offset = dest_offset; -	src_buf = (u8 *)src; +	src_buf = (const u8 *)src;  	for (i = 0; i < bytes_to_verify; i++) {  		flash_char = asd_read_reg_byte(asd_ha, reg + nv_offset + i);  		if (flash_char != src_buf[i]) { @@ -1124,9 +1124,9 @@ int asd_verify_flash_seg(struct asd_ha_struct *asd_ha,   * @bytes_to_write: total bytes to write   */  int asd_write_flash_seg(struct asd_ha_struct *asd_ha, -		void *src, u32 dest_offset, u32 bytes_to_write) +			const void *src, u32 dest_offset, u32 bytes_to_write)  { -	u8 *src_buf; +	const u8 *src_buf;  	u32 nv_offset, reg, i;  	int err; @@ -1153,7 +1153,7 @@ int asd_write_flash_seg(struct asd_ha_struct *asd_ha,  		return err;  	} -	src_buf = (u8 *)src; +	src_buf = (const u8 *)src;  	for (i = 0; i < bytes_to_write; i++) {  		/* Setup program command sequence */  		switch (asd_ha->hw_prof.flash.method) { diff --git a/drivers/scsi/aic94xx/aic94xx_sds.h b/drivers/scsi/aic94xx/aic94xx_sds.h index bb9795a04dc3..a06dc0114b8c 100644 --- a/drivers/scsi/aic94xx/aic94xx_sds.h +++ b/drivers/scsi/aic94xx/aic94xx_sds.h @@ -110,9 +110,9 @@ struct bios_file_header {  };  int asd_verify_flash_seg(struct asd_ha_struct *asd_ha, -		void *src, u32 dest_offset, u32 bytes_to_verify); +		const void *src, u32 dest_offset, u32 bytes_to_verify);  int asd_write_flash_seg(struct asd_ha_struct *asd_ha, -		void *src, u32 dest_offset, u32 bytes_to_write); +		const void *src, u32 dest_offset, u32 bytes_to_write);  int asd_chk_write_status(struct asd_ha_struct *asd_ha,  		u32 sector_addr, u8 erase_flag);  int asd_check_flash_type(struct asd_ha_struct *asd_ha); diff --git a/drivers/scsi/aic94xx/aic94xx_seq.c b/drivers/scsi/aic94xx/aic94xx_seq.c index f4272ac4c685..8f98e33155e9 100644 --- a/drivers/scsi/aic94xx/aic94xx_seq.c +++ b/drivers/scsi/aic94xx/aic94xx_seq.c @@ -46,7 +46,7 @@  static const struct firmware *sequencer_fw;  static u16 cseq_vecs[CSEQ_NUM_VECS], lseq_vecs[LSEQ_NUM_VECS], mode2_task,  	cseq_idle_loop, lseq_idle_loop; -static u8 *cseq_code, *lseq_code; +static const u8 *cseq_code, *lseq_code;  static u32 cseq_code_size, lseq_code_size;  static u16 first_scb_site_no = 0xFFFF; @@ -1235,7 +1235,8 @@ int asd_release_firmware(void)  static int asd_request_firmware(struct asd_ha_struct *asd_ha)  {  	int err, i; -	struct sequencer_file_header header, *hdr_ptr; +	struct sequencer_file_header header; +	const struct sequencer_file_header *hdr_ptr;  	u32 csum = 0;  	u16 *ptr_cseq_vecs, *ptr_lseq_vecs; @@ -1249,7 +1250,7 @@ static int asd_request_firmware(struct asd_ha_struct *asd_ha)  	if (err)  		return err; -	hdr_ptr = (struct sequencer_file_header *)sequencer_fw->data; +	hdr_ptr = (const struct sequencer_file_header *)sequencer_fw->data;  	header.csum = le32_to_cpu(hdr_ptr->csum);  	header.major = le32_to_cpu(hdr_ptr->major); | 
