[PATCH 2/2] nvme-fc: move common code into helper

[James Smart]

On 11/30/2022 1:33 PM, Chaitanya Kulkarni wrote:
> Add a helper to move the duplicate code for error message
> from nvme_fc_rcv_ls_req() to nvme_fc_rcv_ls_req_err_msg().
> 
> Signed-off-by: Chaitanya Kulkarni <kch at nvidia.com>
> ---
>   drivers/nvme/host/fc.c | 19 +++++++++++--------
>   1 file changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index 06bae7150087..42fa450187f8 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -1701,6 +1701,15 @@ nvme_fc_handle_ls_rqst_work(struct work_struct *work)
>   	spin_unlock_irqrestore(&rport->lock, flags);
>   }
>   
> +static
> +void nvme_fc_rcv_ls_req_err_msg(struct nvme_fc_lport *lport,
> +				struct fcnvme_ls_rqst_w0 *w0)
> +{
> +	dev_info(lport->dev, "RCV %s LS failed: No memory\n",
> +		(w0->ls_cmd <= NVME_FC_LAST_LS_CMD_VALUE) ?
> +			nvmefc_ls_names[w0->ls_cmd] : "");
> +}
> +
>   /**
>    * nvme_fc_rcv_ls_req - transport entry point called by an LLDD
>    *                       upon the reception of a NVME LS request.
> @@ -1755,10 +1764,7 @@ nvme_fc_rcv_ls_req(struct nvme_fc_remote_port *portptr,
>   
>   	lsop = kzalloc(sizeof(*lsop), GFP_KERNEL);
>   	if (!lsop) {
> -		dev_info(lport->dev,
> -			"RCV %s LS failed: No memory\n",
> -			(w0->ls_cmd <= NVME_FC_LAST_LS_CMD_VALUE) ?
> -				nvmefc_ls_names[w0->ls_cmd] : "");
> +		nvme_fc_rcv_ls_req_err_msg(lport, w0);
>   		ret = -ENOMEM;
>   		goto out_put;
>   	}
> @@ -1766,10 +1772,7 @@ nvme_fc_rcv_ls_req(struct nvme_fc_remote_port *portptr,
>   	lsop->rqstbuf = kzalloc(sizeof(*lsop->rqstbuf), GFP_KERNEL);
>   	lsop->rspbuf = kzalloc(sizeof(*lsop->rspbuf), GFP_KERNEL);
>   	if (!lsop->rqstbuf || !lsop->rspbuf) {
> -		dev_info(lport->dev,
> -			"RCV %s LS failed: No memory\n",
> -			(w0->ls_cmd <= NVME_FC_LAST_LS_CMD_VALUE) ?
> -				nvmefc_ls_names[w0->ls_cmd] : "");
> +		nvme_fc_rcv_ls_req_err_msg(lport, w0);
>   		ret = -ENOMEM;
>   		goto out_free;
>   	}

OK

Reviewed-by: James Smart <jsmart2021 at gmail.com>

-- james