tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

aic94xx: treat firmware data as const

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

authored by

David Woodhouse and committed by
David Woodhouse 0bc202e0 3b216d18

+12 -11
+6 -6
drivers/scsi/aic94xx/aic94xx_sds.c
··· 1093 1093 * @bytes_to_verify: total bytes to verify 1094 1094 */ 1095 1095 int asd_verify_flash_seg(struct asd_ha_struct *asd_ha, 1096 - void *src, u32 dest_offset, u32 bytes_to_verify) 1096 + const void *src, u32 dest_offset, u32 bytes_to_verify) 1097 1097 { 1098 - u8 *src_buf; 1098 + const u8 *src_buf; 1099 1099 u8 flash_char; 1100 1100 int err; 1101 1101 u32 nv_offset, reg, i; ··· 1105 1105 1106 1106 err = FLASH_OK; 1107 1107 nv_offset = dest_offset; 1108 - src_buf = (u8 *)src; 1108 + src_buf = (const u8 *)src; 1109 1109 for (i = 0; i < bytes_to_verify; i++) { 1110 1110 flash_char = asd_read_reg_byte(asd_ha, reg + nv_offset + i); 1111 1111 if (flash_char != src_buf[i]) { ··· 1124 1124 * @bytes_to_write: total bytes to write 1125 1125 */ 1126 1126 int asd_write_flash_seg(struct asd_ha_struct *asd_ha, 1127 - void *src, u32 dest_offset, u32 bytes_to_write) 1127 + const void *src, u32 dest_offset, u32 bytes_to_write) 1128 1128 { 1129 - u8 *src_buf; 1129 + const u8 *src_buf; 1130 1130 u32 nv_offset, reg, i; 1131 1131 int err; 1132 1132 ··· 1153 1153 return err; 1154 1154 } 1155 1155 1156 - src_buf = (u8 *)src; 1156 + src_buf = (const u8 *)src; 1157 1157 for (i = 0; i < bytes_to_write; i++) { 1158 1158 /* Setup program command sequence */ 1159 1159 switch (asd_ha->hw_prof.flash.method) {
+2 -2
drivers/scsi/aic94xx/aic94xx_sds.h
··· 110 110 }; 111 111 112 112 int asd_verify_flash_seg(struct asd_ha_struct *asd_ha, 113 - void *src, u32 dest_offset, u32 bytes_to_verify); 113 + const void *src, u32 dest_offset, u32 bytes_to_verify); 114 114 int asd_write_flash_seg(struct asd_ha_struct *asd_ha, 115 - void *src, u32 dest_offset, u32 bytes_to_write); 115 + const void *src, u32 dest_offset, u32 bytes_to_write); 116 116 int asd_chk_write_status(struct asd_ha_struct *asd_ha, 117 117 u32 sector_addr, u8 erase_flag); 118 118 int asd_check_flash_type(struct asd_ha_struct *asd_ha);
+4 -3
drivers/scsi/aic94xx/aic94xx_seq.c
··· 46 46 static const struct firmware *sequencer_fw; 47 47 static u16 cseq_vecs[CSEQ_NUM_VECS], lseq_vecs[LSEQ_NUM_VECS], mode2_task, 48 48 cseq_idle_loop, lseq_idle_loop; 49 - static u8 *cseq_code, *lseq_code; 49 + static const u8 *cseq_code, *lseq_code; 50 50 static u32 cseq_code_size, lseq_code_size; 51 51 52 52 static u16 first_scb_site_no = 0xFFFF; ··· 1235 1235 static int asd_request_firmware(struct asd_ha_struct *asd_ha) 1236 1236 { 1237 1237 int err, i; 1238 - struct sequencer_file_header header, *hdr_ptr; 1238 + struct sequencer_file_header header; 1239 + const struct sequencer_file_header *hdr_ptr; 1239 1240 u32 csum = 0; 1240 1241 u16 *ptr_cseq_vecs, *ptr_lseq_vecs; 1241 1242 ··· 1250 1249 if (err) 1251 1250 return err; 1252 1251 1253 - hdr_ptr = (struct sequencer_file_header *)sequencer_fw->data; 1252 + hdr_ptr = (const struct sequencer_file_header *)sequencer_fw->data; 1254 1253 1255 1254 header.csum = le32_to_cpu(hdr_ptr->csum); 1256 1255 header.major = le32_to_cpu(hdr_ptr->major);