diff mbox

[SCSI] aic7xxx: remove redundant assignment to error

Message ID 20170418115327.6833-1-colin.king@canonical.com (mailing list archive)
State Changes Requested, archived
Headers show

Commit Message

Colin King April 18, 2017, 11:53 a.m. UTC
From: Colin Ian King <colin.king@canonical.com>

error is initially assigned to ENOENT and a few statements later
is re-assigned to the error return from the call to ahd_wait_seeprom,
hence the initial assignment is redundant and can be removed.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/scsi/aic7xxx/aic79xx_core.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Johannes Thumshirn April 18, 2017, 12:05 p.m. UTC | #1
On Tue, Apr 18, 2017 at 12:53:27PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> error is initially assigned to ENOENT and a few statements later
> is re-assigned to the error return from the call to ahd_wait_seeprom,
> hence the initial assignment is redundant and can be removed.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/scsi/aic7xxx/aic79xx_core.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
> index 95d8f25cbcca..f5a2714ed82c 100644
> --- a/drivers/scsi/aic7xxx/aic79xx_core.c
> +++ b/drivers/scsi/aic7xxx/aic79xx_core.c
> @@ -10077,7 +10077,6 @@ ahd_write_seeprom(struct ahd_softc *ahd, uint16_t *buf,
>  	int   retval;
>  
>  	AHD_ASSERT_MODES(ahd, AHD_MODE_SCSI_MSK, AHD_MODE_SCSI_MSK);
> -	error = ENOENT;
>  
>  	/* Place the chip into write-enable mode */
>  	ahd_outb(ahd, SEEADR, SEEOP_EWEN_ADDR);
> -- 

Well,
a) the return value of ahd_write_seeprom() is never checked (the only caller
   is ahd_proc_write_seeprom(),
b) Linux error codes are negative,
c) ahd_write_seeprom() has 'retval' and 'error' for returning error values
   back to the caller (which doesn't care...)

So to sum it up, this change doesn't change anything here. But "fixing" the
list above would make a change.

HTH,
	Johannes
diff mbox

Patch

diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 95d8f25cbcca..f5a2714ed82c 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -10077,7 +10077,6 @@  ahd_write_seeprom(struct ahd_softc *ahd, uint16_t *buf,
 	int   retval;
 
 	AHD_ASSERT_MODES(ahd, AHD_MODE_SCSI_MSK, AHD_MODE_SCSI_MSK);
-	error = ENOENT;
 
 	/* Place the chip into write-enable mode */
 	ahd_outb(ahd, SEEADR, SEEOP_EWEN_ADDR);