| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Mon, 29 May 2017 15:00:17 +0200 |
| Subject: net/mlx5: avoid build warning for uniprocessor |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| |
| [ Upstream commit f0d7ae95fff4ab444b8433f07afc4b077ef1a285 ] |
| |
| 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") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Acked-by: Saeed Mahameed <saeedm@mellanox.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| @@ -557,10 +557,9 @@ static int mlx5_irq_set_affinity_hint(st |
| 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; |
| } |
