Commit bd432bb5 authored Apr 11, 2019 by Bart Van Assche Committed by Martin K. Petersen Apr 15, 2019

scsi: qla2xxx: Leave a blank line after declarations

This patch improves readability of the qla2xxx source code.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 2703eaaf

drivers/scsi/qla2xxx/qla_attr.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -674,6 +674,7 @@ qla2x00_sysfs_write_reset(struct file filp, struct kobject kobj,
		int type;
		uint32_t idc_control;
		uint8_t *tmp_data = NULL;

		if (off != 0)
		return -EINVAL;

		@@ -1079,6 +1080,7 @@ qla2x00_isp_name_show(struct device dev, struct device_attribute attr,
		char *buf)
		{
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

		return scnprintf(buf, PAGE_SIZE, "ISP%04X\n", vha->hw->pdev->device);
		}

		@@ -1112,6 +1114,7 @@ qla2x00_model_desc_show(struct device dev, struct device_attribute attr,
		char *buf)
		{
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

		return scnprintf(buf, PAGE_SIZE, "%s\n", vha->hw->model_desc);
		}

		@@ -1324,6 +1327,7 @@ qla2x00_optrom_bios_version_show(struct device *dev,
		{
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
		struct qla_hw_data *ha = vha->hw;

		return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->bios_revision[1],
		ha->bios_revision[0]);
		}
		@@ -1334,6 +1338,7 @@ qla2x00_optrom_efi_version_show(struct device *dev,
		{
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
		struct qla_hw_data *ha = vha->hw;

		return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->efi_revision[1],
		ha->efi_revision[0]);
		}
		@@ -1344,6 +1349,7 @@ qla2x00_optrom_fcode_version_show(struct device *dev,
		{
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
		struct qla_hw_data *ha = vha->hw;

		return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->fcode_revision[1],
		ha->fcode_revision[0]);
		}
		@@ -1354,6 +1360,7 @@ qla2x00_optrom_fw_version_show(struct device *dev,
		{
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
		struct qla_hw_data *ha = vha->hw;

		return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d %d\n",
		ha->fw_revision[0], ha->fw_revision[1], ha->fw_revision[2],
		ha->fw_revision[3]);
		@@ -1380,6 +1387,7 @@ qla2x00_total_isp_aborts_show(struct device *dev,
		struct device_attribute attr, char buf)
		{
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

		return scnprintf(buf, PAGE_SIZE, "%d\n",
		vha->qla_stats.total_isp_aborts);
		}
		@@ -2819,6 +2827,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
		if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) {
		if (ha->fw_attributes & BIT_4) {
		int prot = 0, guard;

		vha->flags.difdix_supported = 1;
		ql_dbg(ql_dbg_user, vha, 0x7082,
		"Registered for DIF/DIX type 1 and 3 protection.\n");

drivers/scsi/qla2xxx/qla_bsg.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1534,6 +1534,7 @@ qla2x00_update_fru_versions(struct bsg_job *bsg_job)
		uint32_t count;
		dma_addr_t sfp_dma;
		void *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);

		if (!sfp) {
		bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
		EXT_STATUS_NO_MEMORY;
		@@ -1584,6 +1585,7 @@ qla2x00_read_fru_status(struct bsg_job *bsg_job)
		struct qla_status_reg sr = (void )bsg;
		dma_addr_t sfp_dma;
		uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);

		if (!sfp) {
		bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
		EXT_STATUS_NO_MEMORY;
		@@ -1634,6 +1636,7 @@ qla2x00_write_fru_status(struct bsg_job *bsg_job)
		struct qla_status_reg sr = (void )bsg;
		dma_addr_t sfp_dma;
		uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);

		if (!sfp) {
		bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
		EXT_STATUS_NO_MEMORY;
		@@ -1680,6 +1683,7 @@ qla2x00_write_i2c(struct bsg_job *bsg_job)
		struct qla_i2c_access i2c = (void )bsg;
		dma_addr_t sfp_dma;
		uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);

		if (!sfp) {
		bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
		EXT_STATUS_NO_MEMORY;
		@@ -1725,6 +1729,7 @@ qla2x00_read_i2c(struct bsg_job *bsg_job)
		struct qla_i2c_access i2c = (void )bsg;
		dma_addr_t sfp_dma;
		uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);

		if (!sfp) {
		bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
		EXT_STATUS_NO_MEMORY;

drivers/scsi/qla2xxx/qla_dfs.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ static int
		qla2x00_dfs_tgt_sess_open(struct inode inode, struct file file)
		{
		scsi_qla_host_t *vha = inode->i_private;

		return single_open(file, qla2x00_dfs_tgt_sess_show, vha);
		}

		@@ -161,6 +162,7 @@ static int
		qla_dfs_fw_resource_cnt_open(struct inode inode, struct file file)
		{
		struct scsi_qla_host *vha = inode->i_private;

		return single_open(file, qla_dfs_fw_resource_cnt_show, vha);
		}

		@@ -250,6 +252,7 @@ static int
		qla_dfs_tgt_counters_open(struct inode inode, struct file file)
		{
		struct scsi_qla_host *vha = inode->i_private;

		return single_open(file, qla_dfs_tgt_counters_show, vha);
		}

drivers/scsi/qla2xxx/qla_gs.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1385,6 +1385,7 @@ qla2x00_mgmt_svr_login(scsi_qla_host_t *vha)
		int ret, rval;
		uint16_t mb[MAILBOX_REGISTER_COUNT];
		struct qla_hw_data *ha = vha->hw;

		ret = QLA_SUCCESS;
		if (vha->flags.management_server_logged_in)
		return ret;
		@@ -1423,6 +1424,7 @@ qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *vha, uint32_t req_size,
		{
		ms_iocb_entry_t *ms_pkt;
		struct qla_hw_data *ha = vha->hw;

		ms_pkt = ha->ms_iocb;
		memset(ms_pkt, 0, sizeof(ms_iocb_entry_t));

drivers/scsi/qla2xxx/qla_init.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1482,6 +1482,7 @@ int qla24xx_post_newsess_work(struct scsi_qla_host vha, port_id_t id,
		u8 port_name, u8 node_name, void *pla, u8 fc4_type)
		{
		struct qla_work_evt *e;

		e = qla2x00_alloc_work(vha, QLA_EVT_NEW_SESS);
		if (!e)
		return QLA_FUNCTION_FAILED;
		@@ -1558,6 +1559,7 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t vha, struct event_arg ea)
		return;
		{
		unsigned long flags;

		fcport = qla2x00_find_fcport_by_nportid
		(vha, &ea->id, 1);
		if (fcport) {
		@@ -4844,6 +4846,7 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
		int rval;
		unsigned long flags, save_flags;
		struct qla_hw_data *ha = vha->hw;

		rval = QLA_SUCCESS;

		/* Get Initiator ID */
		@@ -6406,6 +6409,7 @@ qla83xx_initiating_reset(scsi_qla_host_t *vha)
		qla83xx_idc_audit(vha, IDC_AUDIT_TIMESTAMP);
		} else {
		const char *state = qla83xx_dev_state_to_string(dev_state);

		ql_log(ql_log_info, vha, 0xb057, "HW State: %s.\n", state);

		/* SV: XXX: Is timeout required here? */
		@@ -8210,6 +8214,7 @@ void
		qla84xx_put_chip(struct scsi_qla_host *vha)
		{
		struct qla_hw_data *ha = vha->hw;

		if (ha->cs84xx)
		kref_put(&ha->cs84xx->kref, __qla84xx_chip_release);
		}