Re: [PATCH net] net/mlx5: avoid build warning for uniprocessor
From: Saeed Mahameed
Date: Tue May 30 2017 - 03:24:18 EST
On Mon, May 29, 2017 at 4:00 PM, Arnd Bergmann <arnd@xxxxxxxx> wrote:
> Building the driver with CONFIG_SMP disabled results in a harmless
> warning:
>
> ethernet/mellanox/mlx5/core/main.c: In function 'mlx5_irq_set_affinity_hint':
> ethernet/mellanox/mlx5/core/main.c:615:6: error: unused variable 'irq' [-Werror=unused-variable]
>
> It's better to express the conditional compilation using IS_ENABLED()
> here, as that lets the compiler see what the intented use for the variable
> is, and that it can be silently discarded.
>
> Fixes: b665d98edc9a ("net/mlx5: Tolerate irq_set_affinity_hint() failures")
> igned-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
> index 361cd112bb5b..9274d93d3183 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
> @@ -622,10 +622,9 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
> cpumask_set_cpu(cpumask_local_spread(i, priv->numa_node),
> priv->irq_info[i].mask);
>
> -#ifdef CONFIG_SMP
> - if (irq_set_affinity_hint(irq, priv->irq_info[i].mask))
> + if (IS_ENABLED(CONFIG_SMP) &&
> + irq_set_affinity_hint(irq, priv->irq_info[i].mask))
> mlx5_core_warn(mdev, "irq_set_affinity_hint failed, irq 0x%.4x", irq);
> -#endif
>
> return 0;
> }
Acked-by: Saeed Mahameed <saeedm@xxxxxxxxxxxx>
Thank you Arnd !!