lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 161/281] net/mlx5: avoid build warning for uniprocessor
    Date
    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>
    ---
    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 935e62635f12..3c183b8c083a 100644
    --- 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(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;
    }
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 22:02    [W:4.063 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site