2018-03-13 12:10:53

by Colin King

Subject: [PATCH][next] scsi: lpfc: make several unions static, fix non-ANSI prototype

From: Colin Ian King <[email protected]>

There are several unions that are local to the source and do not need
to be in global scope, so make them static. Also add in a missing void
parameter to functions lpfc_nvme_cmd_template and
lpfc_nvmet_cmd_template to clean up non-ANSI warning.

Cleans up sparse warnings:
drivers/scsi/lpfc/lpfc_nvme.c:68:19: warning: symbol
'lpfc_iread_cmd_template' was not declared. Should it be static?
drivers/scsi/lpfc/lpfc_nvme.c:69:19: warning: symbol
'lpfc_iwrite_cmd_template' was not declared. Should it be static?
drivers/scsi/lpfc/lpfc_nvme.c:70:19: warning: symbol
'lpfc_icmnd_cmd_template' was not declared. Should it be static?
drivers/scsi/lpfc/lpfc_nvme.c:74:24: warning: non-ANSI function
'lpfc_tsend_cmd_template' was not declared. Should it be static?
drivers/scsi/lpfc/lpfc_nvmet.c:78:19: warning: symbol
'lpfc_treceive_cmd_template' was not declared. Should it be static?
drivers/scsi/lpfc/lpfc_nvmet.c:79:19: warning: symbol
'lpfc_trsp_cmd_template' was not declared. Should it be static?
drivers/scsi/lpfc/lpfc_nvmet.c:83:25: warning: non-ANSI function
declaration of function 'lpfc_nvmet_cmd_template'

Signed-off-by: Colin Ian King <[email protected]>
---
drivers/scsi/lpfc/lpfc_nvme.c | 8 ++++----
drivers/scsi/lpfc/lpfc_nvmet.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index 52dd9479b538..378dca40ca20 100644
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@ -65,13 +65,13 @@ lpfc_release_nvme_buf(struct lpfc_hba *, struct lpfc_nvme_buf *);

static struct nvme_fc_port_template lpfc_nvme_template;

-union lpfc_wqe128 lpfc_iread_cmd_template;
-union lpfc_wqe128 lpfc_iwrite_cmd_template;
-union lpfc_wqe128 lpfc_icmnd_cmd_template;
+static union lpfc_wqe128 lpfc_iread_cmd_template;
+static union lpfc_wqe128 lpfc_iwrite_cmd_template;
+static union lpfc_wqe128 lpfc_icmnd_cmd_template;

/* Setup WQE templates for NVME IOs */
void
-lpfc_nvme_cmd_template()
+lpfc_nvme_cmd_template(void)
{
union lpfc_wqe128 *wqe;

diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c
index 07f89524c320..7271c9d885dd 100644
--- a/drivers/scsi/lpfc/lpfc_nvmet.c
+++ b/drivers/scsi/lpfc/lpfc_nvmet.c
@@ -74,13 +74,13 @@ static int lpfc_nvmet_unsol_ls_issue_abort(struct lpfc_hba *,
static void lpfc_nvmet_wqfull_flush(struct lpfc_hba *, struct lpfc_queue *,
struct lpfc_nvmet_rcv_ctx *);

-union lpfc_wqe128 lpfc_tsend_cmd_template;
-union lpfc_wqe128 lpfc_treceive_cmd_template;
-union lpfc_wqe128 lpfc_trsp_cmd_template;
+static union lpfc_wqe128 lpfc_tsend_cmd_template;
+static union lpfc_wqe128 lpfc_treceive_cmd_template;
+static union lpfc_wqe128 lpfc_trsp_cmd_template;

/* Setup WQE templates for NVME IOs */
void
-lpfc_nvmet_cmd_template()
+lpfc_nvmet_cmd_template(void)
{
union lpfc_wqe128 *wqe;

--
2.15.1

2018-03-13 16:31:19

by James Smart

Subject: Re: [PATCH][next] scsi: lpfc: make several unions static, fix non-ANSI prototype

On 3/13/2018 5:08 AM, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> There are several unions that are local to the source and do not need
> to be in global scope, so make them static. Also add in a missing void
> parameter to functions lpfc_nvme_cmd_template and
> lpfc_nvmet_cmd_template to clean up non-ANSI warning.
>
> Cleans up sparse warnings:
> drivers/scsi/lpfc/lpfc_nvme.c:68:19: warning: symbol
> 'lpfc_iread_cmd_template' was not declared. Should it be static?
> drivers/scsi/lpfc/lpfc_nvme.c:69:19: warning: symbol
> 'lpfc_iwrite_cmd_template' was not declared. Should it be static?
> drivers/scsi/lpfc/lpfc_nvme.c:70:19: warning: symbol
> 'lpfc_icmnd_cmd_template' was not declared. Should it be static?
> drivers/scsi/lpfc/lpfc_nvme.c:74:24: warning: non-ANSI function
> 'lpfc_tsend_cmd_template' was not declared. Should it be static?
> drivers/scsi/lpfc/lpfc_nvmet.c:78:19: warning: symbol
> 'lpfc_treceive_cmd_template' was not declared. Should it be static?
> drivers/scsi/lpfc/lpfc_nvmet.c:79:19: warning: symbol
> 'lpfc_trsp_cmd_template' was not declared. Should it be static?
> drivers/scsi/lpfc/lpfc_nvmet.c:83:25: warning: non-ANSI function
> declaration of function 'lpfc_nvmet_cmd_template'
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/scsi/lpfc/lpfc_nvme.c | 8 ++++----
> drivers/scsi/lpfc/lpfc_nvmet.c | 8 ++++----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
>

Signed-off-by:   James Smart <[email protected]>

2018-03-15 03:41:24

by Martin K. Petersen

Subject: Re: [PATCH][next] scsi: lpfc: make several unions static, fix non-ANSI prototype

Colin,

> There are several unions that are local to the source and do not need
> to be in global scope, so make them static. Also add in a missing void
> parameter to functions lpfc_nvme_cmd_template and
> lpfc_nvmet_cmd_template to clean up non-ANSI warning.

Applied to 4.17/scsi-queue. Thanks!

--
Martin K. Petersen Oracle Linux Engineering