aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2012-05-10 22:56:20 -0700
committerNicholas Bellinger <nab@linux-iscsi.org>2012-05-10 22:56:20 -0700
commit9cfffa28f042cbe2367852e991939e28b110617f (patch)
treeaff94e46a7a58be44c5b08f9462b9a07b8ddfab6
parent33690746196b26b04ea795e4de0ae706cb54f5ab (diff)
downloadlio-core-9cfffa28f042cbe2367852e991939e28b110617f.tar.gz
qla2xxx: More minor checkpatch cleanups
A handful of minor checkpatch cleanups for new code.. Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r--drivers/scsi/qla2xxx/qla_target.c22
-rw-r--r--drivers/scsi/qla2xxx/tcm_qla2xxx.c17
2 files changed, 23 insertions, 16 deletions
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 77e179f603600a..df1e282a33e8d4 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -719,7 +719,8 @@ static struct qla_tgt_sess *qlt_create_sess(
/* Check to avoid double sessions */
spin_lock_irqsave(&ha->hardware_lock, flags);
- list_for_each_entry(sess, &ha->tgt.qla_tgt->sess_list, sess_list_entry) {
+ list_for_each_entry(sess, &ha->tgt.qla_tgt->sess_list,
+ sess_list_entry) {
if (!memcmp(sess->port_name, fcport->port_name, WWN_SIZE)) {
ql_dbg(ql_dbg_tgt_mgt, vha, 0xf005,
"Double sess %p found (s_id %x:%x:%x, "
@@ -2645,7 +2646,10 @@ static void qlt_do_work(struct work_struct *work)
spin_unlock_irqrestore(&ha->hardware_lock, flags);
goto out_term;
} else {
- /* Do the extra kref_get() before dropping qla_hw_data->hardware_lock. */
+ /*
+ * Do the extra kref_get() before dropping
+ * qla_hw_data->hardware_lock.
+ */
kref_get(&sess->se_sess->sess_kref);
}
}
@@ -2654,14 +2658,14 @@ static void qlt_do_work(struct work_struct *work)
if (unlikely(!sess)) {
uint8_t *s_id = atio->u.isp24.fcp_hdr.s_id;
- ql_dbg(ql_dbg_tgt_mgt, vha, 0xe125, "qla_target(%d):"
- " Unable to find wwn login (s_id %x:%x:%x),"
- " trying to create it manually\n", vha->vp_idx,
- s_id[0], s_id[1], s_id[2]);
+ ql_dbg(ql_dbg_tgt_mgt, vha, 0xe125,
+ "qla_target(%d): Unable to find wwn login"
+ " (s_id %x:%x:%x), trying to create it manually\n",
+ vha->vp_idx, s_id[0], s_id[1], s_id[2]);
if (atio->u.raw.entry_count > 1) {
- ql_dbg(ql_dbg_tgt_mgt, vha, 0xe127, "Dropping multy entry"
- " cmd %p\n", cmd);
+ ql_dbg(ql_dbg_tgt_mgt, vha, 0xe127,
+ "Dropping multy entry cmd %p\n", cmd);
goto out_term;
}
@@ -2875,7 +2879,7 @@ static int qlt_handle_task_mgmt(struct scsi_qla_host *vha, void *iocb)
struct qla_tgt *tgt;
struct qla_tgt_sess *sess;
uint32_t lun, unpacked_lun;
- int lun_size, fn;
+ int lun_size, fn;
tgt = ha->tgt.qla_tgt;
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index b36074656daf61..24b4e45fb2d043 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -195,7 +195,8 @@ static int tcm_qla2xxx_npiv_parse_wwn(
return 0;
}
-static ssize_t tcm_qla2xxx_npiv_format_wwn(char *buf, size_t len, u64 wwpn, u64 wwnn)
+static ssize_t tcm_qla2xxx_npiv_format_wwn(char *buf, size_t len,
+ u64 wwpn, u64 wwnn)
{
u8 b[8], b2[8];
@@ -359,7 +360,8 @@ static int tcm_qla2xxx_check_prod_write_protect(struct se_portal_group *se_tpg)
return QLA_TPG_ATTRIB(tpg)->prod_mode_write_protect;
}
-static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl(struct se_portal_group *se_tpg)
+static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl(
+ struct se_portal_group *se_tpg)
{
struct tcm_qla2xxx_nacl *nacl;
@@ -748,7 +750,8 @@ static u16 tcm_qla2xxx_get_fabric_sense_len(void)
return 0;
}
-static u16 tcm_qla2xxx_set_fabric_sense_len(struct se_cmd *se_cmd, u32 sense_length)
+static u16 tcm_qla2xxx_set_fabric_sense_len(struct se_cmd *se_cmd,
+ u32 sense_length)
{
return 0;
}
@@ -1242,11 +1245,11 @@ static void tcm_qla2xxx_set_sess_by_s_id(
if (new_se_nacl) {
pr_debug("Setting up new fc_port entry to new_se_nacl\n");
nacl->nport_id = key;
- rc = btree_insert32(&lport->lport_fcport_map, key, new_se_nacl,
- GFP_ATOMIC);
+ rc = btree_insert32(&lport->lport_fcport_map, key,
+ new_se_nacl, GFP_ATOMIC);
if (rc)
- printk(KERN_ERR "Unable to insert s_id into fcport_map: %06x\n",
- (int)key);
+ printk(KERN_ERR "Unable to insert s_id into"
+ " fcport_map: %06x\n", (int)key);
} else {
pr_debug("Wiping nonexisting fc_port entry\n");
}