renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
Code

scsi: aic7xxx: aic79xx: Whitespace cleanup

Browse Source 
Link: https://lore.kernel.org/r/20210113090500.129644-7-hare@suse.de
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke 2021-01-13 10:04:31 +01:00 committed by Martin K. Petersen
parent bcd5c59f21
commit 7662d92374
10 changed files with 208 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/aic7xxx/aic79xx_core.c
View File

@ -2094,8 +2094,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
ahd->msg_type = ahd->msg_type =
MSG_TYPE_TARGET_MSGOUT; MSG_TYPE_TARGET_MSGOUT;
ahd->msgin_index = 0; ahd->msgin_index = 0;
} } else
else
ahd_setup_target_msgin(ahd, ahd_setup_target_msgin(ahd,
&devinfo, &devinfo,
scb); scb);
@ -3446,7 +3445,6 @@ ahd_clear_critical_section(struct ahd_softc *ahd)
cs = ahd->critical_sections; cs = ahd->critical_sections;
for (i = 0; i < ahd->num_critical_sections; i++, cs++) { for (i = 0; i < ahd->num_critical_sections; i++, cs++) {
if (cs->begin < seqaddr && cs->end >= seqaddr) if (cs->begin < seqaddr && cs->end >= seqaddr)
break; break;
} }
@ -9768,7 +9766,6 @@ ahd_dump_card_state(struct ahd_softc *ahd)
} }
printk("\n"); printk("\n");
printk("Sequencer DMA-Up and Complete list: "); printk("Sequencer DMA-Up and Complete list: ");
scb_index = ahd_inw(ahd, COMPLETE_DMA_SCB_HEAD); scb_index = ahd_inw(ahd, COMPLETE_DMA_SCB_HEAD);
i = 0; i = 0;

3
drivers/scsi/aic7xxx/aic79xx_proc.c
View File

@ -242,7 +242,8 @@ ahd_proc_write_seeprom(struct Scsi_Host *shost, char *buffer, int length)
u_int start_addr; u_int start_addr;
if (ahd->seep_config == NULL) { if (ahd->seep_config == NULL) {
ahd->seep_config = kmalloc(sizeof(*ahd->seep_config), GFP_ATOMIC); ahd->seep_config = kmalloc(sizeof(*ahd->seep_config),
GFP_ATOMIC);
if (ahd->seep_config == NULL) { if (ahd->seep_config == NULL) {
printk("aic79xx: Unable to allocate serial " printk("aic79xx: Unable to allocate serial "
"eeprom buffer. Write failing\n"); "eeprom buffer. Write failing\n");

7
drivers/scsi/aic7xxx/aic7xxx_core.c
View File

@ -1286,8 +1286,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
ahc->msg_type = ahc->msg_type =
MSG_TYPE_TARGET_MSGOUT; MSG_TYPE_TARGET_MSGOUT;
ahc->msgin_index = 0; ahc->msgin_index = 0;
} } else
else
ahc_setup_target_msgin(ahc, ahc_setup_target_msgin(ahc,
&devinfo, &devinfo,
scb); scb);
@ -1994,7 +1993,6 @@ ahc_clear_critical_section(struct ahc_softc *ahc)
seqaddr -= 1; seqaddr -= 1;
cs = ahc->critical_sections; cs = ahc->critical_sections;
for (i = 0; i < ahc->num_critical_sections; i++, cs++) { for (i = 0; i < ahc->num_critical_sections; i++, cs++) {
if (cs->begin < seqaddr && cs->end >= seqaddr) if (cs->begin < seqaddr && cs->end >= seqaddr)
break; break;
} }
@ -5989,7 +5987,6 @@ ahc_search_qinfifo(struct ahc_softc *ahc, int target, char channel,
break; break;
} }
} else { } else {
prev = next; prev = next;
next = ahc_inb(ahc, SCB_NEXT); next = ahc_inb(ahc, SCB_NEXT);
} }
@ -7085,7 +7082,6 @@ ahc_print_register(const ahc_reg_parse_entry_t *table, u_int num_entries,
printed_mask == 0 ? ":(" : "|", printed_mask == 0 ? ":(" : "|",
table[entry].name); table[entry].name);
printed_mask |= table[entry].mask; printed_mask |= table[entry].mask;
break; break;
} }
if (entry >= num_entries) if (entry >= num_entries)
@ -7527,7 +7523,6 @@ ahc_handle_en_lun(struct ahc_softc *ahc, struct cam_sim *sim, union ccb *ccb)
targid_mask |= target_mask; targid_mask |= target_mask;
ahc_outb(ahc, TARGID, targid_mask); ahc_outb(ahc, TARGID, targid_mask);
ahc_outb(ahc, TARGID+1, (targid_mask >> 8)); ahc_outb(ahc, TARGID+1, (targid_mask >> 8));
ahc_update_scsiid(ahc, targid_mask); ahc_update_scsiid(ahc, targid_mask);
} else { } else {
u_int our_id; u_int our_id;

15
drivers/scsi/aic7xxx/aic7xxx_osm.c
View File

@ -2361,7 +2361,8 @@ static void ahc_linux_set_period(struct scsi_target *starget, int period)
ppr_options &= MSG_EXT_PPR_QAS_REQ; ppr_options &= MSG_EXT_PPR_QAS_REQ;
} }
syncrate = ahc_find_syncrate(ahc, &period, &ppr_options, AHC_SYNCRATE_DT); syncrate = ahc_find_syncrate(ahc, &period, &ppr_options,
AHC_SYNCRATE_DT);
ahc_lock(ahc, &flags); ahc_lock(ahc, &flags);
ahc_set_syncrate(ahc, &devinfo, syncrate, period, offset, ahc_set_syncrate(ahc, &devinfo, syncrate, period, offset,
ppr_options, AHC_TRANS_GOAL, FALSE); ppr_options, AHC_TRANS_GOAL, FALSE);
@ -2386,7 +2387,8 @@ static void ahc_linux_set_offset(struct scsi_target *starget, int offset)
ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0, ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
starget->channel + 'A', ROLE_INITIATOR); starget->channel + 'A', ROLE_INITIATOR);
if (offset != 0) { if (offset != 0) {
syncrate = ahc_find_syncrate(ahc, &period, &ppr_options, AHC_SYNCRATE_DT); syncrate = ahc_find_syncrate(ahc, &period, &ppr_options,
AHC_SYNCRATE_DT);
period = tinfo->goal.period; period = tinfo->goal.period;
ppr_options = tinfo->goal.ppr_options; ppr_options = tinfo->goal.ppr_options;
} }
@ -2422,7 +2424,8 @@ static void ahc_linux_set_dt(struct scsi_target *starget, int dt)
ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0, ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
starget->channel + 'A', ROLE_INITIATOR); starget->channel + 'A', ROLE_INITIATOR);
syncrate = ahc_find_syncrate(ahc, &period, &ppr_options,AHC_SYNCRATE_DT); syncrate = ahc_find_syncrate(ahc, &period, &ppr_options,
AHC_SYNCRATE_DT);
ahc_lock(ahc, &flags); ahc_lock(ahc, &flags);
ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset, ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset,
ppr_options, AHC_TRANS_GOAL, FALSE); ppr_options, AHC_TRANS_GOAL, FALSE);
@ -2455,7 +2458,8 @@ static void ahc_linux_set_qas(struct scsi_target *starget, int qas)
ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0, ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
starget->channel + 'A', ROLE_INITIATOR); starget->channel + 'A', ROLE_INITIATOR);
syncrate = ahc_find_syncrate(ahc, &period, &ppr_options, AHC_SYNCRATE_DT); syncrate = ahc_find_syncrate(ahc, &period, &ppr_options,
AHC_SYNCRATE_DT);
ahc_lock(ahc, &flags); ahc_lock(ahc, &flags);
ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset, ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset,
ppr_options, AHC_TRANS_GOAL, FALSE); ppr_options, AHC_TRANS_GOAL, FALSE);
@ -2483,7 +2487,8 @@ static void ahc_linux_set_iu(struct scsi_target *starget, int iu)
ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0, ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
starget->channel + 'A', ROLE_INITIATOR); starget->channel + 'A', ROLE_INITIATOR);
syncrate = ahc_find_syncrate(ahc, &period, &ppr_options, AHC_SYNCRATE_DT); syncrate = ahc_find_syncrate(ahc, &period, &ppr_options,
AHC_SYNCRATE_DT);
ahc_lock(ahc, &flags); ahc_lock(ahc, &flags);
ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset, ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset,
ppr_options, AHC_TRANS_GOAL, FALSE); ppr_options, AHC_TRANS_GOAL, FALSE);

3
drivers/scsi/aic7xxx/aic7xxx_proc.c
View File

@ -255,7 +255,8 @@ ahc_proc_write_seeprom(struct Scsi_Host *shost, char *buffer, int length)
u_int start_addr; u_int start_addr;
if (ahc->seep_config == NULL) { if (ahc->seep_config == NULL) {
ahc->seep_config = kmalloc(sizeof(*ahc->seep_config), GFP_ATOMIC); ahc->seep_config = kmalloc(sizeof(*ahc->seep_config),
GFP_ATOMIC);
if (ahc->seep_config == NULL) { if (ahc->seep_config == NULL) {
printk("aic7xxx: Unable to allocate serial " printk("aic7xxx: Unable to allocate serial "
"eeprom buffer. Write failing\n"); "eeprom buffer. Write failing\n");