* Re: [PATCH] qla2xxx: Remove an unused function
2020-05-20 4:07 [PATCH] qla2xxx: Remove an unused function Bart Van Assche
@ 2020-05-20 7:18 ` Daniel Wagner
2020-05-20 17:00 ` Himanshu Madhani
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Daniel Wagner @ 2020-05-20 7:18 UTC (permalink / raw)
To: Bart Van Assche
Cc: Martin K . Petersen, James E . J . Bottomley, linux-scsi,
Arun Easi, Nilesh Javali, Himanshu Madhani, Hannes Reinecke,
Martin Wilck, Roman Bolshakov
On Tue, May 19, 2020 at 09:07:38PM -0700, Bart Van Assche wrote:
> This was detected by building the qla2xxx driver with clang. See also
> commit a9083016a531 ("[SCSI] qla2xxx: Add ISP82XX support").
>
> Cc: Arun Easi <aeasi@marvell.com>
> Cc: Nilesh Javali <njavali@marvell.com>
> Cc: Himanshu Madhani <himanshu.madhani@oracle.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Daniel Wagner <dwagner@suse.de>
> Cc: Martin Wilck <mwilck@suse.com>
> Cc: Roman Bolshakov <r.bolshakov@yadro.com>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] qla2xxx: Remove an unused function
2020-05-20 4:07 [PATCH] qla2xxx: Remove an unused function Bart Van Assche
2020-05-20 7:18 ` Daniel Wagner
@ 2020-05-20 17:00 ` Himanshu Madhani
2020-05-25 18:04 ` Roman Bolshakov
2020-05-27 2:12 ` Martin K. Petersen
3 siblings, 0 replies; 5+ messages in thread
From: Himanshu Madhani @ 2020-05-20 17:00 UTC (permalink / raw)
To: Bart Van Assche, Martin K . Petersen, James E . J . Bottomley
Cc: linux-scsi, Arun Easi, Nilesh Javali, Hannes Reinecke,
Daniel Wagner, Martin Wilck, Roman Bolshakov
On 5/19/20 11:07 PM, Bart Van Assche wrote:
> This was detected by building the qla2xxx driver with clang. See also
> commit a9083016a531 ("[SCSI] qla2xxx: Add ISP82XX support").
>
> Cc: Arun Easi <aeasi@marvell.com>
> Cc: Nilesh Javali <njavali@marvell.com>
> Cc: Himanshu Madhani <himanshu.madhani@oracle.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Daniel Wagner <dwagner@suse.de>
> Cc: Martin Wilck <mwilck@suse.com>
> Cc: Roman Bolshakov <r.bolshakov@yadro.com>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
> drivers/scsi/qla2xxx/qla_nx.c | 41 -----------------------------------
> 1 file changed, 41 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
> index 21f968e4a584..0baf55b7e88f 100644
> --- a/drivers/scsi/qla2xxx/qla_nx.c
> +++ b/drivers/scsi/qla2xxx/qla_nx.c
> @@ -380,47 +380,6 @@ qla82xx_pci_set_crbwindow_2M(struct qla_hw_data *ha, ulong off_in,
> *off_out = (off_in & MASK(16)) + CRB_INDIRECT_2M + ha->nx_pcibase;
> }
>
> -static inline unsigned long
> -qla82xx_pci_set_crbwindow(struct qla_hw_data *ha, u64 off)
> -{
> - scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
> - /* See if we are currently pointing to the region we want to use next */
> - if ((off >= QLA82XX_CRB_PCIX_HOST) && (off < QLA82XX_CRB_DDR_NET)) {
> - /* No need to change window. PCIX and PCIEregs are in both
> - * regs are in both windows.
> - */
> - return off;
> - }
> -
> - if ((off >= QLA82XX_CRB_PCIX_HOST) && (off < QLA82XX_CRB_PCIX_HOST2)) {
> - /* We are in first CRB window */
> - if (ha->curr_window != 0)
> - WARN_ON(1);
> - return off;
> - }
> -
> - if ((off > QLA82XX_CRB_PCIX_HOST2) && (off < QLA82XX_CRB_MAX)) {
> - /* We are in second CRB window */
> - off = off - QLA82XX_CRB_PCIX_HOST2 + QLA82XX_CRB_PCIX_HOST;
> -
> - if (ha->curr_window != 1)
> - return off;
> -
> - /* We are in the QM or direct access
> - * register region - do nothing
> - */
> - if ((off >= QLA82XX_PCI_DIRECT_CRB) &&
> - (off < QLA82XX_PCI_CAMQM_MAX))
> - return off;
> - }
> - /* strange address given */
> - ql_dbg(ql_dbg_p3p, vha, 0xb001,
> - "%s: Warning: unm_nic_pci_set_crbwindow "
> - "called with an unknown address(%llx).\n",
> - QLA2XXX_DRIVER_NAME, off);
> - return off;
> -}
> -
> static int
> qla82xx_pci_get_crb_addr_2M(struct qla_hw_data *ha, ulong off_in,
> void __iomem **off_out)
>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
--
Himanshu Madhani Oracle Linux Engineering
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] qla2xxx: Remove an unused function
2020-05-20 4:07 [PATCH] qla2xxx: Remove an unused function Bart Van Assche
2020-05-20 7:18 ` Daniel Wagner
2020-05-20 17:00 ` Himanshu Madhani
@ 2020-05-25 18:04 ` Roman Bolshakov
2020-05-27 2:12 ` Martin K. Petersen
3 siblings, 0 replies; 5+ messages in thread
From: Roman Bolshakov @ 2020-05-25 18:04 UTC (permalink / raw)
To: Bart Van Assche
Cc: Martin K . Petersen, James E . J . Bottomley, linux-scsi,
Arun Easi, Nilesh Javali, Himanshu Madhani, Hannes Reinecke,
Daniel Wagner, Martin Wilck
On Tue, May 19, 2020 at 09:07:38PM -0700, Bart Van Assche wrote:
> This was detected by building the qla2xxx driver with clang. See also
> commit a9083016a531 ("[SCSI] qla2xxx: Add ISP82XX support").
>
> Cc: Arun Easi <aeasi@marvell.com>
> Cc: Nilesh Javali <njavali@marvell.com>
> Cc: Himanshu Madhani <himanshu.madhani@oracle.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Daniel Wagner <dwagner@suse.de>
> Cc: Martin Wilck <mwilck@suse.com>
> Cc: Roman Bolshakov <r.bolshakov@yadro.com>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
> drivers/scsi/qla2xxx/qla_nx.c | 41 -----------------------------------
> 1 file changed, 41 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
> index 21f968e4a584..0baf55b7e88f 100644
> --- a/drivers/scsi/qla2xxx/qla_nx.c
> +++ b/drivers/scsi/qla2xxx/qla_nx.c
> @@ -380,47 +380,6 @@ qla82xx_pci_set_crbwindow_2M(struct qla_hw_data *ha, ulong off_in,
> *off_out = (off_in & MASK(16)) + CRB_INDIRECT_2M + ha->nx_pcibase;
> }
>
> -static inline unsigned long
> -qla82xx_pci_set_crbwindow(struct qla_hw_data *ha, u64 off)
> -{
> - scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
> - /* See if we are currently pointing to the region we want to use next */
> - if ((off >= QLA82XX_CRB_PCIX_HOST) && (off < QLA82XX_CRB_DDR_NET)) {
> - /* No need to change window. PCIX and PCIEregs are in both
> - * regs are in both windows.
> - */
> - return off;
> - }
> -
> - if ((off >= QLA82XX_CRB_PCIX_HOST) && (off < QLA82XX_CRB_PCIX_HOST2)) {
> - /* We are in first CRB window */
> - if (ha->curr_window != 0)
> - WARN_ON(1);
> - return off;
> - }
> -
> - if ((off > QLA82XX_CRB_PCIX_HOST2) && (off < QLA82XX_CRB_MAX)) {
> - /* We are in second CRB window */
> - off = off - QLA82XX_CRB_PCIX_HOST2 + QLA82XX_CRB_PCIX_HOST;
> -
> - if (ha->curr_window != 1)
> - return off;
> -
> - /* We are in the QM or direct access
> - * register region - do nothing
> - */
> - if ((off >= QLA82XX_PCI_DIRECT_CRB) &&
> - (off < QLA82XX_PCI_CAMQM_MAX))
> - return off;
> - }
> - /* strange address given */
> - ql_dbg(ql_dbg_p3p, vha, 0xb001,
> - "%s: Warning: unm_nic_pci_set_crbwindow "
> - "called with an unknown address(%llx).\n",
> - QLA2XXX_DRIVER_NAME, off);
> - return off;
> -}
> -
> static int
> qla82xx_pci_get_crb_addr_2M(struct qla_hw_data *ha, ulong off_in,
> void __iomem **off_out)
Hi Bart,
Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com>
Thanks,
Roman
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] qla2xxx: Remove an unused function
2020-05-20 4:07 [PATCH] qla2xxx: Remove an unused function Bart Van Assche
` (2 preceding siblings ...)
2020-05-25 18:04 ` Roman Bolshakov
@ 2020-05-27 2:12 ` Martin K. Petersen
3 siblings, 0 replies; 5+ messages in thread
From: Martin K. Petersen @ 2020-05-27 2:12 UTC (permalink / raw)
To: Bart Van Assche, James E . J . Bottomley
Cc: Martin K . Petersen, Hannes Reinecke, Arun Easi, linux-scsi,
Himanshu Madhani, Daniel Wagner, Nilesh Javali, Roman Bolshakov,
Martin Wilck
On Tue, 19 May 2020 21:07:38 -0700, Bart Van Assche wrote:
> This was detected by building the qla2xxx driver with clang. See also
> commit a9083016a531 ("[SCSI] qla2xxx: Add ISP82XX support").
Applied to 5.8/scsi-queue, thanks!
[1/1] scsi: qla2xxx: Remove an unused function
https://git.kernel.org/mkp/scsi/c/ce9a9321c118
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 5+ messages in thread