[PATCH] scsi: qla2xxx: Remove the repeated declaration

[PATCH] scsi: qla2xxx: Remove the repeated declaration

[Shaokun Zhang]

Functions 'qla2x00_post_uevent_work', 'qla2x00_free_fcport' and
variable 'ql2xexlogins' are declared twice, remove the repeated
declaration.

Cc: Nilesh Javali <njavali@marvell.com>
Cc: GR-QLogic-Storage-Upstream@marvell.com
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com> 
Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
---
 drivers/scsi/qla2xxx/qla_gbl.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index fae5cae6f0a8..418be9a2fcf6 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -173,7 +173,6 @@ extern int ql2xnvmeenable;
 extern int ql2xautodetectsfp;
 extern int ql2xenablemsix;
 extern int qla2xuseresexchforels;
-extern int ql2xexlogins;
 extern int ql2xdifbundlinginternalbuffers;
 extern int ql2xfulldump_on_mpifail;
 extern int ql2xenforce_iocb_limit;
@@ -220,7 +219,6 @@ extern int qla83xx_set_drv_presence(scsi_qla_host_t *vha);
 extern int __qla83xx_set_drv_presence(scsi_qla_host_t *vha);
 extern int qla83xx_clear_drv_presence(scsi_qla_host_t *vha);
 extern int __qla83xx_clear_drv_presence(scsi_qla_host_t *vha);
-extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32);
 
 extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32);
 extern void qla2x00_disable_board_on_pci_error(struct work_struct *);
@@ -687,8 +685,6 @@ extern int qla2x00_chk_ms_status(scsi_qla_host_t *, ms_iocb_entry_t *,
 	struct ct_sns_rsp *, const char *);
 extern void qla2x00_async_iocb_timeout(void *data);
 
-extern void qla2x00_free_fcport(fc_port_t *);
-
 extern int qla24xx_post_gpnid_work(struct scsi_qla_host *, port_id_t *);
 extern int qla24xx_async_gpnid(scsi_qla_host_t *, port_id_t *);
 void qla24xx_handle_gpnid_event(scsi_qla_host_t *, struct event_arg *);
-- 
2.7.4

Re: [PATCH] scsi: qla2xxx: Remove the repeated declaration

[Shaokun Zhang]

Hi,

A gentle ping, sorry for the noise.

Thanks,
Shaokun

On 2021/5/24 16:03, Shaokun Zhang wrote:
> Functions 'qla2x00_post_uevent_work', 'qla2x00_free_fcport' and
> variable 'ql2xexlogins' are declared twice, remove the repeated
> declaration.
> 
> Cc: Nilesh Javali <njavali@marvell.com>
> Cc: GR-QLogic-Storage-Upstream@marvell.com
> Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
> Cc: "Martin K. Petersen" <martin.petersen@oracle.com> 
> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
> ---
>  drivers/scsi/qla2xxx/qla_gbl.h | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
> index fae5cae6f0a8..418be9a2fcf6 100644
> --- a/drivers/scsi/qla2xxx/qla_gbl.h
> +++ b/drivers/scsi/qla2xxx/qla_gbl.h
> @@ -173,7 +173,6 @@ extern int ql2xnvmeenable;
>  extern int ql2xautodetectsfp;
>  extern int ql2xenablemsix;
>  extern int qla2xuseresexchforels;
> -extern int ql2xexlogins;
>  extern int ql2xdifbundlinginternalbuffers;
>  extern int ql2xfulldump_on_mpifail;
>  extern int ql2xenforce_iocb_limit;
> @@ -220,7 +219,6 @@ extern int qla83xx_set_drv_presence(scsi_qla_host_t *vha);
>  extern int __qla83xx_set_drv_presence(scsi_qla_host_t *vha);
>  extern int qla83xx_clear_drv_presence(scsi_qla_host_t *vha);
>  extern int __qla83xx_clear_drv_presence(scsi_qla_host_t *vha);
> -extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32);
>  
>  extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32);
>  extern void qla2x00_disable_board_on_pci_error(struct work_struct *);
> @@ -687,8 +685,6 @@ extern int qla2x00_chk_ms_status(scsi_qla_host_t *, ms_iocb_entry_t *,
>  	struct ct_sns_rsp *, const char *);
>  extern void qla2x00_async_iocb_timeout(void *data);
>  
> -extern void qla2x00_free_fcport(fc_port_t *);
> -
>  extern int qla24xx_post_gpnid_work(struct scsi_qla_host *, port_id_t *);
>  extern int qla24xx_async_gpnid(scsi_qla_host_t *, port_id_t *);
>  void qla24xx_handle_gpnid_event(scsi_qla_host_t *, struct event_arg *);
> 

Re: [PATCH] scsi: qla2xxx: Remove the repeated declaration

[Himanshu Madhani]

On 5/24/21 3:03 AM, Shaokun Zhang wrote:
> Functions 'qla2x00_post_uevent_work', 'qla2x00_free_fcport' and
> variable 'ql2xexlogins' are declared twice, remove the repeated
> declaration.
> 
> Cc: Nilesh Javali <njavali@marvell.com>
> Cc: GR-QLogic-Storage-Upstream@marvell.com
> Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
> Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
> ---
>   drivers/scsi/qla2xxx/qla_gbl.h | 4 ----
>   1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
> index fae5cae6f0a8..418be9a2fcf6 100644
> --- a/drivers/scsi/qla2xxx/qla_gbl.h
> +++ b/drivers/scsi/qla2xxx/qla_gbl.h
> @@ -173,7 +173,6 @@ extern int ql2xnvmeenable;
>   extern int ql2xautodetectsfp;
>   extern int ql2xenablemsix;
>   extern int qla2xuseresexchforels;
> -extern int ql2xexlogins;
>   extern int ql2xdifbundlinginternalbuffers;
>   extern int ql2xfulldump_on_mpifail;
>   extern int ql2xenforce_iocb_limit;
> @@ -220,7 +219,6 @@ extern int qla83xx_set_drv_presence(scsi_qla_host_t *vha);
>   extern int __qla83xx_set_drv_presence(scsi_qla_host_t *vha);
>   extern int qla83xx_clear_drv_presence(scsi_qla_host_t *vha);
>   extern int __qla83xx_clear_drv_presence(scsi_qla_host_t *vha);
> -extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32);
>   
>   extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32);
>   extern void qla2x00_disable_board_on_pci_error(struct work_struct *);
> @@ -687,8 +685,6 @@ extern int qla2x00_chk_ms_status(scsi_qla_host_t *, ms_iocb_entry_t *,
>   	struct ct_sns_rsp *, const char *);
>   extern void qla2x00_async_iocb_timeout(void *data);
>   
> -extern void qla2x00_free_fcport(fc_port_t *);
> -
>   extern int qla24xx_post_gpnid_work(struct scsi_qla_host *, port_id_t *);
>   extern int qla24xx_async_gpnid(scsi_qla_host_t *, port_id_t *);
>   void qla24xx_handle_gpnid_event(scsi_qla_host_t *, struct event_arg *);
> 

Looks good.

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>

-- 
Himanshu Madhani                                Oracle Linux Engineering

Re: [PATCH] scsi: qla2xxx: Remove the repeated declaration

[Martin K. Petersen]

Shaokun,

> Functions 'qla2x00_post_uevent_work', 'qla2x00_free_fcport' and
> variable 'ql2xexlogins' are declared twice, remove the repeated
> declaration.

Applied to 5.14/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering