From patchwork Mon Mar 19 16:01:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132085 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp47505ljb; Mon, 19 Mar 2018 14:01:55 -0700 (PDT) X-Google-Smtp-Source: AG47ELtQCzC+JqRIzBFjppUEsFta5rNfe6z4lyN5mPPAPrrUjy2PwweUmD+sOVfkbbKUUvgWdOjR X-Received: by 10.98.75.129 with SMTP id d1mr11428593pfj.19.1521493315302; Mon, 19 Mar 2018 14:01:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521493315; cv=none; d=google.com; s=arc-20160816; b=Maih6c7/b6a4hJjwt5dSK3FJeX9olH3bAVADuD9USpWE4p4mofuKhv1u0DheshITA/ RPp1xyQsx5kVMRkgNBN4/E28vlcNOveRjUExXcRm17yoPF09JZ+grbxrpor6QbLrd1lr 26tEISBZeTehFKNW2GYmzD49Ink6HDQuGgSi3unvgPlJfuBHpB/lL2vuFiQf9DuaZ7cs /4Kg5Gq6RjO42agCeH2lbCG0YdmwfNRLTbGya8xxqBqzsOTIRprALoSdIa8RLS1EAJz6 px201qDrKT9EmgdQO1qL8wiZcGAq5zO4kwZLTKeE3X5FdHp6fZFFNxPraYrs5Q0CDzGC ASGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=MA6SHdSVA6u8PdYHlRkj9p6VREYNGq9a2gjZQVpbpO8=; b=GnlyjQNrQ+PR/mB6s4pePJXwz2XHOc/K0YPa/AlW4sJHy10jRE9zwWOGmHq2Q0OUNc JjRFXBbdX6pP22M4NWEOsV1pwBeUVSi+mlCLIeegItZNu283tOYEKdgBkFcpBW3G33Dl ljGWzGbQGl3OeXVXr3FfayNjMpQHw6IrvthVV7mUOwM107jNXNmuq+CxoNyANljBR9lH ZfxIY1hOjOZkUQT3Syr6qvFzf2cfrgok0y87Cl17N5H87qzNvGxaut8aPZTB/QR6MZ7M DJKsOO1xUPnUfAPvliqZ+pswiHFCscboTempdeHDcKg/ELy2L46CLfNhwTopHKquiDTC yZGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=k45w7hh1; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t80si62253pgb.686.2018.03.19.14.01.54; Mon, 19 Mar 2018 14:01:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=k45w7hh1; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968694AbeCSVBw (ORCPT + 10 others); Mon, 19 Mar 2018 17:01:52 -0400 Received: from mail-dm3nam03on0119.outbound.protection.outlook.com ([104.47.41.119]:22560 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965481AbeCSQCw (ORCPT ); Mon, 19 Mar 2018 12:02:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=MA6SHdSVA6u8PdYHlRkj9p6VREYNGq9a2gjZQVpbpO8=; b=k45w7hh1/8Nr5g603QWSOtSXshUYyuzGkoLeJ+elbTMYJA2UbW6B3fjt7hoHfcFODZe2Ji/198TCAY0ADwitoGdCmTlUi1yj/Hptkc0hDouX5NhRpL4ZpwVVwWW4dEYfI8VkQ/d2OQrF9GjZmoQBT8neNFdHq+Q+Mnvv0bKIoQ0= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1062.namprd21.prod.outlook.com (52.132.128.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:02:41 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 16:02:41 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Arnd Bergmann , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 161/281] net/mlx5: avoid build warning for uniprocessor Thread-Topic: [PATCH AUTOSEL for 4.9 161/281] net/mlx5: avoid build warning for uniprocessor Thread-Index: AQHTv5t7eq+0oF4EH0OO5LTRUM3aBA== Date: Mon, 19 Mar 2018 16:01:03 +0000 Message-ID: <20180319155742.13731-161-alexander.levin@microsoft.com> References: <20180319155742.13731-1-alexander.levin@microsoft.com> In-Reply-To: <20180319155742.13731-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1062; 7:5WWcdzlXISogB7k23VbofCJT3+aIfE6jgDcDVwUJhsH6WYqggGjhLv3hGG7bk6w/MlicLB6n3QTqn6E9E+AIwjVCcubj8eZWC3CLLUukQIzSUyAzjVnDEtLgr4Fp5f+IA9eU1leJ56wgGrXFoCp8HZuN/SUMkXdgg1qOJgoM9pd76oIVMJCvCePRhkW35YNzp8xWlzgVngFZjjlHgIBlxGEcOCWBa4VBweIEukyq4VLH8yjSdOXD3H0kJC765NKx; 20:rus+wv3GX0IJP86dPjOVKlk81nNxR6n/FnkkFgCy4YnplaH79fzf1eaJ5re2XAHP862a99EtxXlhylIZrIPHE25uvoUG+6rMiqYdvR3ccDFEaCefKxz7vyCQNVdfnK8XE95NOy15KtiaUwLFRXCtXO5+Q0iyDOS0dv7DGyYW8h0= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 21760392-4fe3-4fdb-8f61-08d58db2d850 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1062; x-ms-traffictypediagnostic: DM5PR2101MB1062: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1062; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1062; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(346002)(366004)(396003)(39380400002)(199004)(189003)(106356001)(10290500003)(478600001)(110136005)(22452003)(3280700002)(6666003)(54906003)(2906002)(2900100001)(2950100002)(186003)(10090500001)(97736004)(26005)(5660300001)(72206003)(66066001)(53936002)(107886003)(102836004)(59450400001)(6512007)(6506007)(316002)(7736002)(305945005)(1076002)(6436002)(36756003)(3846002)(6116002)(6486002)(105586002)(8936002)(86612001)(68736007)(3660700001)(86362001)(575784001)(81166006)(81156014)(8676002)(25786009)(2501003)(4326008)(76176011)(5250100002)(14454004)(99286004)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1062; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Vb+YVa9uOBV2BnIQ4tayiqoYOM8iPweM920wagfK5wuEV19wF4UTb3HLdNrHaUC7cwsqqqg7FYXV7Sb1YzT00KbJw0W1PpgjPAZAA4SCaUKC6tZCnBmd81+PvWoDPXWYxPxQrN1j9SJkkK4m3drLXm5vjLsjJsZDZI5cBC1WhVo2dmNN6P+/kAHY/vtYjOfnpGfDydBjZpoKvXotUuwigjBtBWP7+afahV0rFlrVVb9mJ63hdrF6eyjo4SaRS49IvuBhjS64Iy9vJi3e/1ndERSYQDR+PcZPNNYMohFUO4aaEdPLBJIF3uXAFjjLsHiIZEEcIpz2souF31HBIbdivg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21760392-4fe3-4fdb-8f61-08d58db2d850 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:01:03.9936 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1062 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ 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 Acked-by: Saeed Mahameed Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.14.1 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; }