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

scsi: qedf: Merge a few quoted strings split across lines 



Merge some quoted strings to improve readability and to save some lines
of code.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarChad Dupuis <chad.dupuis@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c4d6ffc8

drivers/scsi/qedf/qedf_main.c

+6 −12
Original line number Diff line number Diff line
@@ -975,8 +975,7 @@ static int qedf_alloc_sq(struct qedf_ctx *qedf, struct qedf_rport *fcport) 
	fcport->sq = dma_zalloc_coherent(&qedf->pdev->dev,

	    fcport->sq_mem_size, &fcport->sq_dma, GFP_KERNEL);

	if (!fcport->sq) {

		QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate send "

			   "queue.\n");

		QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate send queue.\n");

		rval = 1;

		goto out;

	}
@@ -984,8 +983,7 @@ static int qedf_alloc_sq(struct qedf_ctx *qedf, struct qedf_rport *fcport) 
	fcport->sq_pbl = dma_zalloc_coherent(&qedf->pdev->dev,

	    fcport->sq_pbl_size, &fcport->sq_pbl_dma, GFP_KERNEL);

	if (!fcport->sq_pbl) {

		QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate send "

			   "queue PBL.\n");

		QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate send queue PBL.\n");

		rval = 1;

		goto out_free_sq;

	}
@@ -2598,8 +2596,7 @@ static int qedf_alloc_bdq(struct qedf_ctx *qedf) 
	qedf->bdq_pbl_list = dma_zalloc_coherent(&qedf->pdev->dev,

	    QEDF_PAGE_SIZE, &qedf->bdq_pbl_list_dma, GFP_KERNEL);

	if (!qedf->bdq_pbl_list) {

		QEDF_ERR(&(qedf->dbg_ctx), "Could not allocate list of PBL "

		    "pages.\n");

		QEDF_ERR(&(qedf->dbg_ctx), "Could not allocate list of PBL pages.\n");

		return -ENOMEM;

	}
@@ -2691,8 +2688,7 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf) 
			&qedf->global_queues[i]->cq_dma, GFP_KERNEL);



		if (!qedf->global_queues[i]->cq) {

			QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate "

				   "cq.\n");

			QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate cq.\n");

			status = -ENOMEM;

			goto mem_alloc_failure;

		}
@@ -2703,8 +2699,7 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf) 
			&qedf->global_queues[i]->cq_pbl_dma, GFP_KERNEL);



		if (!qedf->global_queues[i]->cq_pbl) {

			QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate "

				   "cq PBL.\n");

			QEDF_WARN(&(qedf->dbg_ctx), "Could not allocate cq PBL.\n");

			status = -ENOMEM;

			goto mem_alloc_failure;

		}
@@ -2800,8 +2795,7 @@ static int qedf_set_fcoe_pf_param(struct qedf_ctx *qedf) 
	cq_mem_size = ALIGN(cq_mem_size, QEDF_PAGE_SIZE);

	cq_num_entries = cq_mem_size / sizeof(struct fcoe_cqe);



	memset(&(qedf->pf_params), 0,

	    sizeof(qedf->pf_params));

	memset(&(qedf->pf_params), 0, sizeof(qedf->pf_params));



	/* Setup the value for fcoe PF */

	qedf->pf_params.fcoe_pf_params.num_cons = QEDF_MAX_SESSIONS;

CRA Git | Maintained and supported by SUSTech CRA and CCSE