diff mbox series

[net-next,2/2] mlxsw: spectrum_kvdl: avoid uninitialized variable warning

Message ID 20180223131540.1065413-2-arnd@arndb.de
State Accepted
Commit ed2da6270ed9ea37d39e9ab597fc5b3b4215ae2a
Headers show
Series [net-next,1/2] mlxsw: spectrum_kvdl: use div_u64() for 64-bit division | expand

Commit Message

Arnd Bergmann Feb. 23, 2018, 1:15 p.m. UTC
gcc warns that 'resource_id' is not initialized if we don't come though
any of the three 'case' statements before:

drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c: In function 'mlxsw_sp_kvdl_part_init':
drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c:275:8: error: 'resource_id' may be used uninitialized in this function [-Werror=maybe-uninitialized]

In the current code, that won't happen, but it's more robust to explicitly
handle this by returning a failure from mlxsw_sp_kvdl_part_init.

Fixes: 887839e6960d ("mlxsw: spectrum_kvdl: Add support for dynamic partition set")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.9.0

Comments

Arkadi Sharshevsky Feb. 25, 2018, 10:04 a.m. UTC | #1
On 02/23/2018 03:15 PM, Arnd Bergmann wrote:
> gcc warns that 'resource_id' is not initialized if we don't come though

> any of the three 'case' statements before:

> 

> drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c: In function 'mlxsw_sp_kvdl_part_init':

> drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c:275:8: error: 'resource_id' may be used uninitialized in this function [-Werror=maybe-uninitialized]

> 

> In the current code, that won't happen, but it's more robust to explicitly

> handle this by returning a failure from mlxsw_sp_kvdl_part_init.

> 

> Fixes: 887839e6960d ("mlxsw: spectrum_kvdl: Add support for dynamic partition set")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 2 ++

>  1 file changed, 2 insertions(+)

> 

> diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c

> index 6fd701db90c9..059eb3214328 100644

> --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c

> +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c

> @@ -270,6 +270,8 @@ static int mlxsw_sp_kvdl_part_init(struct mlxsw_sp *mlxsw_sp,

>  	case MLXSW_SP_KVDL_PART_LARGE_CHUNKS:

>  		resource_id = MLXSW_SP_RESOURCE_KVD_LINEAR_LARGE_CHUNKS;

>  		break;

> +	default:

> +		return -EINVAL;

>  	}

>  

>  	err = devlink_resource_size_get(devlink, resource_id, &resource_size);

> 

Acked-by: Arkadi Sharshevsky <arkadis@mellanox.com>
David Miller Feb. 26, 2018, 4:33 p.m. UTC | #2
From: Arnd Bergmann <arnd@arndb.de>

Date: Fri, 23 Feb 2018 14:15:32 +0100

> gcc warns that 'resource_id' is not initialized if we don't come though

> any of the three 'case' statements before:

> 

> drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c: In function 'mlxsw_sp_kvdl_part_init':

> drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c:275:8: error: 'resource_id' may be used uninitialized in this function [-Werror=maybe-uninitialized]

> 

> In the current code, that won't happen, but it's more robust to explicitly

> handle this by returning a failure from mlxsw_sp_kvdl_part_init.

> 

> Fixes: 887839e6960d ("mlxsw: spectrum_kvdl: Add support for dynamic partition set")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Applied.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c
index 6fd701db90c9..059eb3214328 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c
@@ -270,6 +270,8 @@  static int mlxsw_sp_kvdl_part_init(struct mlxsw_sp *mlxsw_sp,
 	case MLXSW_SP_KVDL_PART_LARGE_CHUNKS:
 		resource_id = MLXSW_SP_RESOURCE_KVD_LINEAR_LARGE_CHUNKS;
 		break;
+	default:
+		return -EINVAL;
 	}
 
 	err = devlink_resource_size_get(devlink, resource_id, &resource_size);