Commit 58e2753c authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen

scsi: qla2xxx: Insert spaces where required

Improve source code readability by inserting spaces where these are
required according to the coding standard. This patch only inserts
whitespace and does not make any other changes.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Acked-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 845bbb09
...@@ -888,7 +888,7 @@ qla2x00_sysfs_read_xgmac_stats(struct file *filp, struct kobject *kobj, ...@@ -888,7 +888,7 @@ qla2x00_sysfs_read_xgmac_stats(struct file *filp, struct kobject *kobj,
count = 0; count = 0;
} }
count = actual_size > count ? count: actual_size; count = actual_size > count ? count : actual_size;
memcpy(buf, ha->xgmac_data, count); memcpy(buf, ha->xgmac_data, count);
return count; return count;
...@@ -2811,8 +2811,8 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable) ...@@ -2811,8 +2811,8 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
/* initialized vport states */ /* initialized vport states */
atomic_set(&vha->loop_state, LOOP_DOWN); atomic_set(&vha->loop_state, LOOP_DOWN);
vha->vp_err_state= VP_ERR_PORTDWN; vha->vp_err_state = VP_ERR_PORTDWN;
vha->vp_prev_err_state= VP_ERR_UNKWN; vha->vp_prev_err_state = VP_ERR_UNKWN;
/* Check if physical ha port is Up */ /* Check if physical ha port is Up */
if (atomic_read(&base_vha->loop_state) == LOOP_DOWN || if (atomic_read(&base_vha->loop_state) == LOOP_DOWN ||
atomic_read(&base_vha->loop_state) == LOOP_DEAD) { atomic_read(&base_vha->loop_state) == LOOP_DEAD) {
......
...@@ -445,7 +445,7 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram, ...@@ -445,7 +445,7 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram,
} }
} }
*nxt = rval == QLA_SUCCESS ? &ram[cnt]: NULL; *nxt = rval == QLA_SUCCESS ? &ram[cnt] : NULL;
return rval; return rval;
} }
......
...@@ -2448,7 +2448,7 @@ qla2x00_fdmiv2_rpa(scsi_qla_host_t *vha) ...@@ -2448,7 +2448,7 @@ qla2x00_fdmiv2_rpa(scsi_qla_host_t *vha)
eiter->type = cpu_to_be16(FDMI_PORT_MAX_FRAME_SIZE); eiter->type = cpu_to_be16(FDMI_PORT_MAX_FRAME_SIZE);
eiter->len = cpu_to_be16(4 + 4); eiter->len = cpu_to_be16(4 + 4);
eiter->a.max_frame_size = IS_FWI2_CAPABLE(ha) ? eiter->a.max_frame_size = IS_FWI2_CAPABLE(ha) ?
le16_to_cpu(icb24->frame_payload_size): le16_to_cpu(icb24->frame_payload_size) :
le16_to_cpu(ha->init_cb->frame_payload_size); le16_to_cpu(ha->init_cb->frame_payload_size);
eiter->a.max_frame_size = cpu_to_be32(eiter->a.max_frame_size); eiter->a.max_frame_size = cpu_to_be32(eiter->a.max_frame_size);
size += 4 + 4; size += 4 + 4;
......
...@@ -4711,7 +4711,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha) ...@@ -4711,7 +4711,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
ha->zio_mode = icb->add_firmware_options[0] & ha->zio_mode = icb->add_firmware_options[0] &
(BIT_3 | BIT_2 | BIT_1 | BIT_0); (BIT_3 | BIT_2 | BIT_1 | BIT_0);
ha->zio_timer = icb->interrupt_delay_timer ? ha->zio_timer = icb->interrupt_delay_timer ?
icb->interrupt_delay_timer: 2; icb->interrupt_delay_timer : 2;
} }
icb->add_firmware_options[0] &= icb->add_firmware_options[0] &=
~(BIT_3 | BIT_2 | BIT_1 | BIT_0); ~(BIT_3 | BIT_2 | BIT_1 | BIT_0);
...@@ -4744,7 +4744,7 @@ qla2x00_rport_del(void *data) ...@@ -4744,7 +4744,7 @@ qla2x00_rport_del(void *data)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(fcport->vha->host->host_lock, flags); spin_lock_irqsave(fcport->vha->host->host_lock, flags);
rport = fcport->drport ? fcport->drport: fcport->rport; rport = fcport->drport ? fcport->drport : fcport->rport;
fcport->drport = NULL; fcport->drport = NULL;
spin_unlock_irqrestore(fcport->vha->host->host_lock, flags); spin_unlock_irqrestore(fcport->vha->host->host_lock, flags);
if (rport) { if (rport) {
...@@ -7208,11 +7208,11 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) ...@@ -7208,11 +7208,11 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
ha->flags.disable_risc_code_load = 0; ha->flags.disable_risc_code_load = 0;
ha->flags.enable_lip_reset = 0; ha->flags.enable_lip_reset = 0;
ha->flags.enable_lip_full_login = ha->flags.enable_lip_full_login =
le32_to_cpu(nv->host_p) & BIT_10 ? 1: 0; le32_to_cpu(nv->host_p) & BIT_10 ? 1 : 0;
ha->flags.enable_target_reset = ha->flags.enable_target_reset =
le32_to_cpu(nv->host_p) & BIT_11 ? 1: 0; le32_to_cpu(nv->host_p) & BIT_11 ? 1 : 0;
ha->flags.enable_led_scheme = 0; ha->flags.enable_led_scheme = 0;
ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1: 0; ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1 : 0;
ha->operating_mode = (le32_to_cpu(icb->firmware_options_2) & ha->operating_mode = (le32_to_cpu(icb->firmware_options_2) &
(BIT_6 | BIT_5 | BIT_4)) >> 4; (BIT_6 | BIT_5 | BIT_4)) >> 4;
...@@ -7286,7 +7286,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) ...@@ -7286,7 +7286,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
ha->zio_mode = le32_to_cpu(icb->firmware_options_2) & ha->zio_mode = le32_to_cpu(icb->firmware_options_2) &
(BIT_3 | BIT_2 | BIT_1 | BIT_0); (BIT_3 | BIT_2 | BIT_1 | BIT_0);
ha->zio_timer = le16_to_cpu(icb->interrupt_delay_timer) ? ha->zio_timer = le16_to_cpu(icb->interrupt_delay_timer) ?
le16_to_cpu(icb->interrupt_delay_timer): 2; le16_to_cpu(icb->interrupt_delay_timer) : 2;
} }
icb->firmware_options_2 &= cpu_to_le32( icb->firmware_options_2 &= cpu_to_le32(
~(BIT_3 | BIT_2 | BIT_1 | BIT_0)); ~(BIT_3 | BIT_2 | BIT_1 | BIT_0));
...@@ -8232,7 +8232,7 @@ qla84xx_init_chip(scsi_qla_host_t *vha) ...@@ -8232,7 +8232,7 @@ qla84xx_init_chip(scsi_qla_host_t *vha)
mutex_unlock(&ha->cs84xx->fw_update_mutex); mutex_unlock(&ha->cs84xx->fw_update_mutex);
return rval != QLA_SUCCESS || status[0] ? QLA_FUNCTION_FAILED: return rval != QLA_SUCCESS || status[0] ? QLA_FUNCTION_FAILED :
QLA_SUCCESS; QLA_SUCCESS;
} }
...@@ -8428,11 +8428,11 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) ...@@ -8428,11 +8428,11 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
ha->flags.disable_risc_code_load = 0; ha->flags.disable_risc_code_load = 0;
ha->flags.enable_lip_reset = 0; ha->flags.enable_lip_reset = 0;
ha->flags.enable_lip_full_login = ha->flags.enable_lip_full_login =
le32_to_cpu(nv->host_p) & BIT_10 ? 1: 0; le32_to_cpu(nv->host_p) & BIT_10 ? 1 : 0;
ha->flags.enable_target_reset = ha->flags.enable_target_reset =
le32_to_cpu(nv->host_p) & BIT_11 ? 1: 0; le32_to_cpu(nv->host_p) & BIT_11 ? 1 : 0;
ha->flags.enable_led_scheme = 0; ha->flags.enable_led_scheme = 0;
ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1: 0; ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1 : 0;
ha->operating_mode = (le32_to_cpu(icb->firmware_options_2) & ha->operating_mode = (le32_to_cpu(icb->firmware_options_2) &
(BIT_6 | BIT_5 | BIT_4)) >> 4; (BIT_6 | BIT_5 | BIT_4)) >> 4;
...@@ -8505,7 +8505,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) ...@@ -8505,7 +8505,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
ha->zio_mode = le32_to_cpu(icb->firmware_options_2) & ha->zio_mode = le32_to_cpu(icb->firmware_options_2) &
(BIT_3 | BIT_2 | BIT_1 | BIT_0); (BIT_3 | BIT_2 | BIT_1 | BIT_0);
ha->zio_timer = le16_to_cpu(icb->interrupt_delay_timer) ? ha->zio_timer = le16_to_cpu(icb->interrupt_delay_timer) ?
le16_to_cpu(icb->interrupt_delay_timer): 2; le16_to_cpu(icb->interrupt_delay_timer) : 2;
} }
icb->firmware_options_2 &= cpu_to_le32( icb->firmware_options_2 &= cpu_to_le32(
~(BIT_3 | BIT_2 | BIT_1 | BIT_0)); ~(BIT_3 | BIT_2 | BIT_1 | BIT_0));
......
...@@ -2494,7 +2494,7 @@ qla2x00_logout_iocb(srb_t *sp, struct mbx_entry *mbx) ...@@ -2494,7 +2494,7 @@ qla2x00_logout_iocb(srb_t *sp, struct mbx_entry *mbx)
SET_TARGET_ID(ha, mbx->loop_id, sp->fcport->loop_id); SET_TARGET_ID(ha, mbx->loop_id, sp->fcport->loop_id);
mbx->mb0 = cpu_to_le16(MBC_LOGOUT_FABRIC_PORT); mbx->mb0 = cpu_to_le16(MBC_LOGOUT_FABRIC_PORT);
mbx->mb1 = HAS_EXTENDED_IDS(ha) ? mbx->mb1 = HAS_EXTENDED_IDS(ha) ?
cpu_to_le16(sp->fcport->loop_id): cpu_to_le16(sp->fcport->loop_id) :
cpu_to_le16(sp->fcport->loop_id << 8); cpu_to_le16(sp->fcport->loop_id << 8);
mbx->mb2 = cpu_to_le16(sp->fcport->d_id.b.domain); mbx->mb2 = cpu_to_le16(sp->fcport->d_id.b.domain);
mbx->mb3 = cpu_to_le16(sp->fcport->d_id.b.area << 8 | mbx->mb3 = cpu_to_le16(sp->fcport->d_id.b.area << 8 |
......
...@@ -2033,7 +2033,7 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt) ...@@ -2033,7 +2033,7 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt)
/* Passback COS information. */ /* Passback COS information. */
fcport->supported_classes = (pd->options & BIT_4) ? fcport->supported_classes = (pd->options & BIT_4) ?
FC_COS_CLASS2: FC_COS_CLASS3; FC_COS_CLASS2 : FC_COS_CLASS3;
} }
gpd_error_out: gpd_error_out:
...@@ -3277,7 +3277,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport, ...@@ -3277,7 +3277,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
/* Issue marker IOCB. */ /* Issue marker IOCB. */
rval2 = qla2x00_marker(vha, ha->base_qpair, fcport->loop_id, l, rval2 = qla2x00_marker(vha, ha->base_qpair, fcport->loop_id, l,
type == TCF_LUN_RESET ? MK_SYNC_ID_LUN: MK_SYNC_ID); type == TCF_LUN_RESET ? MK_SYNC_ID_LUN : MK_SYNC_ID);
if (rval2 != QLA_SUCCESS) { if (rval2 != QLA_SUCCESS) {
ql_dbg(ql_dbg_mbx, vha, 0x1099, ql_dbg(ql_dbg_mbx, vha, 0x1099,
"Failed to issue marker IOCB (%x).\n", rval2); "Failed to issue marker IOCB (%x).\n", rval2);
......
...@@ -108,7 +108,7 @@ MODULE_PARM_DESC(ql2xshiftctondsd, ...@@ -108,7 +108,7 @@ MODULE_PARM_DESC(ql2xshiftctondsd,
"Set to control shifting of command type processing " "Set to control shifting of command type processing "
"based on total number of SG elements."); "based on total number of SG elements.");
int ql2xfdmienable=1; int ql2xfdmienable = 1;
module_param(ql2xfdmienable, int, S_IRUGO|S_IWUSR); module_param(ql2xfdmienable, int, S_IRUGO|S_IWUSR);
module_param_named(fdmi, ql2xfdmienable, int, S_IRUGO|S_IWUSR); module_param_named(fdmi, ql2xfdmienable, int, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(ql2xfdmienable, MODULE_PARM_DESC(ql2xfdmienable,
...@@ -154,7 +154,7 @@ MODULE_PARM_DESC(ql2xenablehba_err_chk, ...@@ -154,7 +154,7 @@ MODULE_PARM_DESC(ql2xenablehba_err_chk,
" 1 -- Error isolation enabled only for DIX Type 0\n" " 1 -- Error isolation enabled only for DIX Type 0\n"
" 2 -- Error isolation enabled for all Types\n"); " 2 -- Error isolation enabled for all Types\n");
int ql2xiidmaenable=1; int ql2xiidmaenable = 1;
module_param(ql2xiidmaenable, int, S_IRUGO); module_param(ql2xiidmaenable, int, S_IRUGO);
MODULE_PARM_DESC(ql2xiidmaenable, MODULE_PARM_DESC(ql2xiidmaenable,
"Enables iIDMA settings " "Enables iIDMA settings "
......
...@@ -987,7 +987,7 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha) ...@@ -987,7 +987,7 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)
ha->fdt_unprotect_sec_cmd = flash_conf_addr(ha, 0x0300 | ha->fdt_unprotect_sec_cmd = flash_conf_addr(ha, 0x0300 |
fdt->unprotect_sec_cmd); fdt->unprotect_sec_cmd);
ha->fdt_protect_sec_cmd = fdt->protect_sec_cmd ? ha->fdt_protect_sec_cmd = fdt->protect_sec_cmd ?
flash_conf_addr(ha, 0x0300 | fdt->protect_sec_cmd): flash_conf_addr(ha, 0x0300 | fdt->protect_sec_cmd) :
flash_conf_addr(ha, 0x0336); flash_conf_addr(ha, 0x0336);
} }
goto done; goto done;
......
...@@ -855,7 +855,7 @@ enum trace_flags { ...@@ -855,7 +855,7 @@ enum trace_flags {
TRC_CTIO_ERR = BIT_11, TRC_CTIO_ERR = BIT_11,
TRC_CTIO_DONE = BIT_12, TRC_CTIO_DONE = BIT_12,
TRC_CTIO_ABORTED = BIT_13, TRC_CTIO_ABORTED = BIT_13,
TRC_CTIO_STRANGE= BIT_14, TRC_CTIO_STRANGE = BIT_14,
TRC_CMD_DONE = BIT_15, TRC_CMD_DONE = BIT_15,
TRC_CMD_CHK_STOP = BIT_16, TRC_CMD_CHK_STOP = BIT_16,
TRC_CMD_FREE = BIT_17, TRC_CMD_FREE = BIT_17,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment