From patchwork Fri May 5 19:47:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98696 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292862qge; Fri, 5 May 2017 12:48:45 -0700 (PDT) X-Received: by 10.98.12.72 with SMTP id u69mr18729458pfi.47.1494013725547; Fri, 05 May 2017 12:48:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013725; cv=none; d=google.com; s=arc-20160816; b=XmocUHfnUr3ZwoXK+iq+f4AVQsZjKjz3LNzcgsTip/m+CXy+QGOg6LEG2hriHBgnxQ p4B1GfLvf44o9vpTlN8nzlcmXXRd8u9OqKoegZNUQQ0cTYYMckUTl+a/VlFSTKrfNJ0f SffJsbs4t7XLK2DmPw5VniPSvJzSQ417CFsCI7l7TM0Fk/vshNo4705EVlLy7FcWWdB/ 8ph/6eeJUZhXAJkgIkkzf3un3IxF1pLsSnVrJCcdFveDVCSkXlAQQ6FcRpJFI9fPWxwt AyqGKVjrX/jKz+M8er0iTG29Rg6o2HEXCWxXDJ1YMyrZc0bszyGF24657OYKOJaHdi7b 7/sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=wdTv5/2q7k7DN5cJE+L2rg1HVJN2Fjf2xOIfoGooAOs=; b=IFgBnZLKQbA2qGfa9KzCsxb1Jgytny8100CkLEmypXJLoi21qsOCZXL03y8NQSnd60 kGfHEJGIhUmq4y97upGjmJwhGwndMDCAVqvGWz93CBhWjcevd3/Ng4NFtcWbhhFAAIY7 AEAzAJOhWQNYQD1PpqeO1P8sPRZ9YcMc9BufuOQBeBFk/qI69ZRR19ZlmRYKG5mk4Zrj bHQ5AS6XjGov2LFfdSQLX+bkKfUuZEHT7ueXalwGi6oNi5W+7eIMLDj0SOQDptf1ixc+ FGnSjhGW4at0Thq5j9BAeQ4OuI+DObAJ1iKR5mkEfzfjWZx14mQ3fEZ7Uyn281lTKtQ5 pBLw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.45; Fri, 05 May 2017 12:48:45 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755587AbdEETsk (ORCPT + 6 others); Fri, 5 May 2017 15:48:40 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:62995 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755597AbdEETsd (ORCPT ); Fri, 5 May 2017 15:48:33 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MSUvb-1dVitD11EB-00TUQg; Fri, 05 May 2017 21:48:28 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Kalle Valo , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 57/87] iwlegacy: avoid warning about missing braces Date: Fri, 5 May 2017 21:47:15 +0200 Message-Id: <20170505194745.3627137-58-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:qHwg6kzIZC/Gxm2Ixt51DtIZdIh6UQXkB/9RvMJeXyUCmAp/vv+ Jcdnr7laR4QZ8C/8jC9KjhiaPUiljqL/VA1IOX4WVeemhDO/tsZcyI2ctydd1WUwTIWFdQY iEVAitV0eYnq9f66xOBf+t2UxfGodjvFu6lGCFchizUenHaVH30FFVhD+U+ecN202GlAbpi OBa52kAQrp8uNI/Eco9pA== X-UI-Out-Filterresults: notjunk:1; V01:K0:J2cCFDyITBY=:KF7ccnFS7uz06mR6CNHTgs rl9PayuoVCbZlZ2tmJdkKGDuUMM4HOQ+DkJP/wEFv4vBPM+MGx8oX+LpWB5dpBoND9EX9eVg6 wjH1hkpswiPMP7iwokCGK5WIHxaqIG6CC+cY0jDwvc092K8L4r0meDHfZMOiWWy9n7ab23Wcw izEPgFvBrYS3BpMAeDi7rhoSV909FVLdaZ2R8E2B45unNcS1pOyFJP8HIqB8X7fTcqCBK2F0u gA+zTDoW4h8PP1hBz2hpZIwUie7/Jm3uGpIJkQ55pIbE4W6jL32BI66D/poqn5XvzX9qPGr6z DBpqj7a/OXsb6u3aC76ysSU9NURwr7mu/YDMYpvJv1KWi8+vpQBmzg0zVSn4Q9AFbpJ67p3Mz lmzXtqpBo2KhRR4VRNLsRjgFe4uBVvFZmlpOLdU//zFjMBqAljzHq64ODfuX0ZqhZ2U3xlvXH ADKfsDgateqElvMGc/qge5sdG13TsQwUmbDyUwejZHEzJ0E9KPPlPGdgbAIcq1QXoOkBiyug3 moxQPsC3mew/oVk/AnJefONVmhZ7ql3+dAs2nWBEEgMjUXRHA8WU5e1qJmRNa7Iiu1bZZ/EvT ljorAp6Kmx1v2CxsIyu9KU4k4u71GxzW8auoBhFVopKolKNJVesjIjQ86sdyQkGs6CK6uVm4A YctnSlYlkN6OwX0PtMjVRqbcsnktroUf5YS19/f1QyKCq3tV1iracjzGB8U91iRWIZ7E= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 2cce76c3fab410520610a7d2f52faebc3cfcf843 upstream. gcc-6 warns about code in il3945_hw_txq_ctx_free() being somewhat ambiguous: drivers/net/wireless/intel/iwlegacy/3945.c:1022:5: warning: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] This adds a set of curly braces to avoid the warning. Signed-off-by: Arnd Bergmann Acked-by: Stanislaw Gruszka Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/net/wireless/iwlegacy/3945.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c index b598e2803500..fbfd77440049 100644 --- a/drivers/net/wireless/iwlegacy/3945.c +++ b/drivers/net/wireless/iwlegacy/3945.c @@ -1019,12 +1019,13 @@ il3945_hw_txq_ctx_free(struct il_priv *il) int txq_id; /* Tx queues */ - if (il->txq) + if (il->txq) { for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++) if (txq_id == IL39_CMD_QUEUE_NUM) il_cmd_queue_free(il); else il_tx_queue_free(il, txq_id); + } /* free tx queue structure */ il_free_txq_mem(il);