[PATCH] aic94xx: Skip reading user settings if flash is not found

[PATCH] aic94xx: Skip reading user settings if flash is not found

[Hannes Reinecke]

If no user settings are found it's pointless trying to
read them from flash. So skip that step.
This also fixes a compilation warning about uninitialized variables in
aic94xx.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 drivers/scsi/aic94xx/aic94xx_sds.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c
index edb43fd..c831e30 100644
--- a/drivers/scsi/aic94xx/aic94xx_sds.c
+++ b/drivers/scsi/aic94xx/aic94xx_sds.c
@@ -983,7 +983,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha,
 {
 	int err, i;
 	u32 offs, size;
-	struct asd_ll_el *el;
+	struct asd_ll_el *el = NULL;
 	struct asd_ctrla_phy_settings *ps;
 	struct asd_ctrla_phy_settings dflt_ps;
 
@@ -1004,6 +1004,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha,
 
 		size = sizeof(struct asd_ctrla_phy_settings);
 		ps = &dflt_ps;
+		goto out_process;
 	}
 
 	if (size == 0)
@@ -1028,7 +1029,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha,
 		ASD_DPRINTK("couldn't find ctrla phy settings struct\n");
 		goto out2;
 	}
-
+out_process:
 	err = asd_process_ctrla_phy_settings(asd_ha, ps);
 	if (err) {
 		ASD_DPRINTK("couldn't process ctrla phy settings\n");
-- 
1.8.5.2

Re: [PATCH] aic94xx: Skip reading user settings if flash is not found

[James Bottomley]

On Mon, 2015-07-06 at 13:07 +0200, Hannes Reinecke wrote:
> If no user settings are found it's pointless trying to
> read them from flash. So skip that step.
> This also fixes a compilation warning about uninitialized variables in
> aic94xx.
> 
> Signed-off-by: Hannes Reinecke <hare@suse.de>

This patch looks fine to me but needs a second review, please.

James

>  drivers/scsi/aic94xx/aic94xx_sds.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c
> index edb43fd..c831e30 100644
> --- a/drivers/scsi/aic94xx/aic94xx_sds.c
> +++ b/drivers/scsi/aic94xx/aic94xx_sds.c
> @@ -983,7 +983,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha,
>  {
>  	int err, i;
>  	u32 offs, size;
> -	struct asd_ll_el *el;
> +	struct asd_ll_el *el = NULL;
>  	struct asd_ctrla_phy_settings *ps;
>  	struct asd_ctrla_phy_settings dflt_ps;
>  
> @@ -1004,6 +1004,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha,
>  
>  		size = sizeof(struct asd_ctrla_phy_settings);
>  		ps = &dflt_ps;
> +		goto out_process;
>  	}
>  
>  	if (size == 0)
> @@ -1028,7 +1029,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha,
>  		ASD_DPRINTK("couldn't find ctrla phy settings struct\n");
>  		goto out2;
>  	}
> -
> +out_process:
>  	err = asd_process_ctrla_phy_settings(asd_ha, ps);
>  	if (err) {
>  		ASD_DPRINTK("couldn't process ctrla phy settings\n");

Re: [PATCH] aic94xx: Skip reading user settings if flash is not found

[Christoph Hellwig]

On Mon, Jul 06, 2015 at 01:07:58PM +0200, Hannes Reinecke wrote:
> If no user settings are found it's pointless trying to
> read them from flash. So skip that step.
> This also fixes a compilation warning about uninitialized variables in
> aic94xx.

This looks okay to me.

Reviewed-by: Christoph Hellwig <hch@lst.de>