2021-02-04 07:31:17

by Yang Li

Subject: [PATCH] scsi: ipr: Remove unneeded return variable

This patch removes unneeded return variables, using only
'0' instead.
It fixes the following warning detected by coccinelle:
./drivers/scsi/ipr.c:9508:5-7: Unneeded variable: "rc". Return "0" on
line 9524

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Yang Li <[email protected]>
---
drivers/scsi/ipr.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index e451102..8eced7c 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -9505,7 +9505,6 @@ static pci_ers_result_t ipr_pci_error_detected(struct pci_dev *pdev,
**/
static int ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg)
{
- int rc = 0;
unsigned long host_lock_flags = 0;

ENTER;
@@ -9521,7 +9520,7 @@ static int ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg)
spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);

LEAVE;
- return rc;
+ return 0;
}

/**
--
1.8.3.1

2021-02-04 23:37:24

by Johannes Thumshirn

Subject: Re: [PATCH] scsi: ipr: Remove unneeded return variable

On 04/02/2021 08:28, Yang Li wrote:
> This patch removes unneeded return variables, using only
> '0' instead.
> It fixes the following warning detected by coccinelle:
> ./drivers/scsi/ipr.c:9508:5-7: Unneeded variable: "rc". Return "0" on
> line 9524
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Yang Li <[email protected]>
> ---
> drivers/scsi/ipr.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
> index e451102..8eced7c 100644
> --- a/drivers/scsi/ipr.c
> +++ b/drivers/scsi/ipr.c
> @@ -9505,7 +9505,6 @@ static pci_ers_result_t ipr_pci_error_detected(struct pci_dev *pdev,
> **/
> static int ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg)
> {
> - int rc = 0;
> unsigned long host_lock_flags = 0;
>
> ENTER;
> @@ -9521,7 +9520,7 @@ static int ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg)
> spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);
>
> LEAVE;
> - return rc;
> + return 0;
> }
>
> /**
>

As it's always returning 0 this is dead code as well:

rc = ipr_probe_ioa_part2(ioa_cfg);

if (rc) {
__ipr_remove(pdev);
return rc;
}

I think:
- static int ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg)
+ static void ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg)

is the right thing to do if you really want to touch it.