net: aquantia: return 'err' if set MPI_DEINIT state fails

YueHaibing · davem330 · commit 4e3c7c00bba0 · 2018-11-27T15:23:37.000-08:00
Fixes gcc '-Wunused-but-set-variable' warning: drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c:260:7: warning: variable 'err' set but not used [-Wunused-but-set-variable] 'err' should be returned while set MPI_DEINIT state fails in hw_atl_utils_soft_reset. Fixes: cce96d1 ("net: aquantia: Regression on reset with 1.x firmware") Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
@@ -263,6 +263,8 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self)
 		AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_MPI_STATE_ADR) &
 				HW_ATL_MPI_STATE_MSK) == MPI_DEINIT,
 			       10, 1000U);
+		if (err)
+			return err;
 	}
 
 	if (self->rbl_enabled)

Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,8 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self)`
`263`	`263`	`AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_MPI_STATE_ADR) &`
`264`	`264`	`HW_ATL_MPI_STATE_MSK) == MPI_DEINIT,`
`265`	`265`	`10, 1000U);`
	`266`	`+ if (err)`
	`267`	`+ return err;`
`266`	`268`	`}`
`267`	`269`
`268`	`270`	`if (self->rbl_enabled)`