Commit c7fa2c85 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Martin K. Petersen
Browse files

scsi: be2iscsi: Fix some missing space in some messages 

Fix a few style issues reported by checkpatch.pl:

 - Avoid duplicated word in comment.

 - Add missing space in messages.

 - Unneeded continuation line character.

 - Unneeded extra spaces.

 - Unneeded log message after memory allocation failure.

Link: https://lore.kernel.org/r/8cb62f0eb96ec7ce7a73fe97cb4490dd5121ecff.1623482155.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 030e4138

drivers/scsi/be2iscsi/be_main.c

+38 −64
Original line number Diff line number Diff line
@@ -143,8 +143,7 @@ DEVICE_ATTR(beiscsi_##_name, S_IRUGO | S_IWUSR,\ 
	      beiscsi_##_name##_disp, beiscsi_##_name##_store)



/*

 * When new log level added update the

 * the MAX allowed value for log_enable

 * When new log level added update MAX allowed value for log_enable

 */

BEISCSI_RW_ATTR(log_enable, 0x00,

		0xFF, 0x00, "Enable logging Bit Mask\n"
@@ -825,9 +824,8 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) 
					  &phwi_context->be_eq[i]);

			if (ret) {

				beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

					    "BM_%d : beiscsi_init_irqs-Failed to"

					    "register msix for i = %d\n",

					    i);

					    "BM_%d : %s-Failed to register msix for i = %d\n",

					    __func__, i);

				kfree(phba->msi_name[i]);

				goto free_msix_irqs;

			}
@@ -842,8 +840,8 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) 
				  phba->msi_name[i], &phwi_context->be_eq[i]);

		if (ret) {

			beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

				    "BM_%d : beiscsi_init_irqs-"

				    "Failed to register beiscsi_msix_mcc\n");

				    "BM_%d : %s-Failed to register beiscsi_msix_mcc\n",

				    __func__);

			kfree(phba->msi_name[i]);

			goto free_msix_irqs;

		}
@@ -853,8 +851,8 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) 
				  "beiscsi", phba);

		if (ret) {

			beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

				    "BM_%d : beiscsi_init_irqs-"

				    "Failed to register irq\\n");

				    "BM_%d : %s-Failed to register irq\n",

				    __func__);

			return ret;

		}

	}
@@ -1374,7 +1372,7 @@ static void hwi_complete_cmd(struct beiscsi_conn *beiscsi_conn, 
		beiscsi_log(phba, KERN_ERR,

			    BEISCSI_LOG_CONFIG | BEISCSI_LOG_IO,

			    "BM_%d :\t\t No HWH_TYPE_LOGIN Expected in"

			    " hwi_complete_cmd- Solicited path\n");

			    " %s- Solicited path\n", __func__);

		break;



	case HWH_TYPE_NOP:
@@ -1384,8 +1382,8 @@ static void hwi_complete_cmd(struct beiscsi_conn *beiscsi_conn, 
	default:

		beiscsi_log(phba, KERN_WARNING,

			    BEISCSI_LOG_CONFIG | BEISCSI_LOG_IO,

			    "BM_%d : In hwi_complete_cmd, unknown type = %d"

			    "wrb_index 0x%x CID 0x%x\n", type,

			    "BM_%d : In %s, unknown type = %d "

			    "wrb_index 0x%x CID 0x%x\n", __func__, type,

			    csol_cqe.wrb_index,

			    csol_cqe.cid);

		break;
@@ -2010,8 +2008,7 @@ unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq, int budget) 
		default:

			beiscsi_log(phba, KERN_ERR,

				    BEISCSI_LOG_IO | BEISCSI_LOG_CONFIG,

				    "BM_%d : Invalid CQE Event Received Code : %d"

				    "CID 0x%x...\n",

				    "BM_%d : Invalid CQE Event Received Code : %d CID 0x%x...\n",

				    code, cid);

			break;

		}
@@ -3001,7 +2998,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba, 
	void *eq_vaddress;

	dma_addr_t paddr;



	num_eq_pages = PAGES_REQUIRED(phba->params.num_eq_entries * \

	num_eq_pages = PAGES_REQUIRED(phba->params.num_eq_entries *

				      sizeof(struct be_eq_entry));



	if (phba->pcidev->msix_enabled)
@@ -3034,8 +3031,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba, 
					    BEISCSI_EQ_DELAY_DEF);

		if (ret) {

			beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

				    "BM_%d : beiscsi_cmd_eq_create"

				    "Failed for EQ\n");

				    "BM_%d : beiscsi_cmd_eq_create Failed for EQ\n");

			goto create_eq_error;

		}
@@ -3068,7 +3064,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, 
	int ret = -ENOMEM;

	dma_addr_t paddr;



	num_cq_pages = PAGES_REQUIRED(phba->params.num_cq_entries * \

	num_cq_pages = PAGES_REQUIRED(phba->params.num_cq_entries *

				      sizeof(struct sol_cqe));



	for (i = 0; i < phba->num_cpus; i++) {
@@ -3090,8 +3086,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, 
				    sizeof(struct sol_cqe), cq_vaddress);

		if (ret) {

			beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

				    "BM_%d : be_fill_queue Failed "

				    "for ISCSI CQ\n");

				    "BM_%d : be_fill_queue Failed for ISCSI CQ\n");

			goto create_cq_error;

		}
@@ -3100,8 +3095,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, 
					    false, 0);

		if (ret) {

			beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

				    "BM_%d : beiscsi_cmd_eq_create"

				    "Failed for ISCSI CQ\n");

				    "BM_%d : beiscsi_cmd_eq_create Failed for ISCSI CQ\n");

			goto create_cq_error;

		}

		beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
@@ -3226,8 +3220,8 @@ beiscsi_create_def_data(struct beiscsi_hba *phba, 
		    phwi_context->be_def_dataq[ulp_num].id);



	beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,

		    "BM_%d : DEFAULT PDU DATA RING CREATED"

		    "on ULP : %d\n", ulp_num);

		    "BM_%d : DEFAULT PDU DATA RING CREATED on ULP : %d\n",

		    ulp_num);

	return 0;

}
@@ -3374,14 +3368,13 @@ beiscsi_create_wrb_rings(struct beiscsi_hba *phba, 
		} else {

			idx++;

			wrb_vaddr = mem_descr->mem_array[idx].virtual_address;

			pa_addr_lo = mem_descr->mem_array[idx].\

			pa_addr_lo = mem_descr->mem_array[idx].

					bus_address.u.a64.address;

			num_wrb_rings = mem_descr->mem_array[idx].size /

					(phba->params.wrbs_per_cxn *

					sizeof(struct iscsi_wrb));

			pwrb_arr[num].virtual_address = wrb_vaddr;

			pwrb_arr[num].bus_address.u.a64.address\

						= pa_addr_lo;

			pwrb_arr[num].bus_address.u.a64.address = pa_addr_lo;

			pwrb_arr[num].size = phba->params.wrbs_per_cxn *

						 sizeof(struct iscsi_wrb);

			wrb_vaddr += pwrb_arr[num].size;
@@ -3995,13 +3988,8 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba) 
					       GFP_KERNEL);



			if (!ptr_cid_info) {

				beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

					    "BM_%d : Failed to allocate memory"

					    "for ULP_CID_INFO for ULP : %d\n",

					    ulp_num);

				ret = -ENOMEM;

				goto free_memory;



			}



			/* Allocate memory for CID array */
@@ -4010,10 +3998,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba) 
					sizeof(*ptr_cid_info->cid_array),

					GFP_KERNEL);

			if (!ptr_cid_info->cid_array) {

				beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

					    "BM_%d : Failed to allocate memory"

					    "for CID_ARRAY for ULP : %d\n",

					    ulp_num);

				kfree(ptr_cid_info);

				ptr_cid_info = NULL;

				ret = -ENOMEM;
@@ -4031,9 +4015,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba) 
				 sizeof(struct iscsi_endpoint *),

				 GFP_KERNEL);

	if (!phba->ep_array) {

		beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

			    "BM_%d : Failed to allocate memory in "

			    "hba_setup_cid_tbls\n");

		ret = -ENOMEM;



		goto free_memory;
@@ -4043,10 +4024,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba) 
				   sizeof(struct beiscsi_conn *),

				   GFP_KERNEL);

	if (!phba->conn_table) {

		beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

			    "BM_%d : Failed to allocate memory in"

			    "hba_setup_cid_tbls\n");



		kfree(phba->ep_array);

		phba->ep_array = NULL;

		ret = -ENOMEM;
@@ -4428,8 +4405,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
						    BEISCSI_LOG_CONFIG,

						    "BM_%d : Alloc of MGMT_SGL_ICD Failed "

						    "for the CID : %d\n",

						    beiscsi_conn->

						    beiscsi_conn_cid);

						    beiscsi_conn->beiscsi_conn_cid);

					goto free_hndls;

				}
@@ -4446,8 +4422,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
						    BEISCSI_LOG_CONFIG,

						    "BM_%d : Alloc of WRB_HANDLE Failed "

						    "for the CID : %d\n",

						    beiscsi_conn->

						    beiscsi_conn_cid);

						    beiscsi_conn->beiscsi_conn_cid);

					goto free_mgmt_hndls;

				}

				beiscsi_conn->plogin_wrb_handle =
@@ -4467,8 +4442,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
					    BEISCSI_LOG_CONFIG,

					    "BM_%d : Alloc of MGMT_SGL_ICD Failed "

					    "for the CID : %d\n",

					    beiscsi_conn->

					    beiscsi_conn_cid);

					    beiscsi_conn->beiscsi_conn_cid);

				goto free_hndls;

			}

			io_task->pwrb_handle =