From patchwork Thu May 19 07:58:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102316 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp3055991qge; Thu, 19 May 2016 00:59:24 -0700 (PDT) X-Received: by 10.98.51.132 with SMTP id z126mr17288889pfz.23.1463644764641; Thu, 19 May 2016 00:59:24 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o123si18359447pfb.55.2016.05.19.00.59.24; Thu, 19 May 2016 00:59:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754039AbcESH7W (ORCPT + 29 others); Thu, 19 May 2016 03:59:22 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:55223 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752002AbcESH7U (ORCPT ); Thu, 19 May 2016 03:59:20 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0MKyv2-1b3IrJ0Wpc-0001GG; Thu, 19 May 2016 09:59:05 +0200 From: Arnd Bergmann To: Stanislaw Gruszka , Kalle Valo Cc: Arnd Bergmann , Johannes Berg , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] iwlegacy: avoid warning about missing braces Date: Thu, 19 May 2016 09:58:49 +0200 Message-Id: <1463644741-529379-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:yq0KydQsfoz0Nx2UAJ90w+8aaoocgwtPF+K8AN6b640WV8Opn+s SQiTSbQ940L8pUQzS6rq+67/uLM/e4bUO/XO8cGUrvyYbvC0DtBH8hhvMjQZMaxv0xUvDa0 vqCDjSWuEQIaEn/Z6x7EcOlRWQYrvCQ3JyY7NKR4K+gEwafowlDG2AAhcl33/JXQuAVlkQQ Gp8swHZOgawn3kWz4dqrA== X-UI-Out-Filterresults: notjunk:1; V01:K0:re8F1vGGrlQ=:zT5MRhfiIMNLMjNYIlDJ3h HPtrym/QEXT/JvmRvuxfK6u+Pe/hGSDXtKsYYfduFsJS+uYXj+ES51kZ1Wzs3qpQcvqyypiZL ycn+bqw4Zgyhlh6qLJFW6L5sNXjEwS7kFdF0QnRa7bBC3WmelQt5122ctnF5KE1T+xaJApkvw csdCmTREPmCFqA9B31d1khXnmaFURJfL3VJWCDDhdHYqSVMwHLffSRCADeuMvZpNcw/9vLV+i Svwc94T9vXYxZbh6JEj8iQu7oxeb/LBUnn/zPfn8XDPhTXEic9XvuixmOFWzppxkEUBtprJAA k856HE8PZuBsoCmnTw5PsJuuOXXGilMpQAN6IghLzikN+EolZpKg1mhYgRKhpstTEdWSUpvaY YP8yS7ZOLnS5yXK8vjXmJp5TaChGCeuQU31otONNAtypKjcNEM8PsgtOFFHpn9ymFCtFc2EEb 90hA8EL4XzVEEGY1HIQqcvkDpa7+WH8ynvPk5Lue35tXiYnUZ0rCTcurAUjofwNL3QOTCdZAh p3XA331Zhj8Nza1THI5pjGP9udJhX7seRv/VQgBnkh1yi6kNJrDZ1CjYb2XnJLgnZ3K01Asc3 itdHTzdwrJrFj6mGFv+hkx82teQAQWpfiItfHTNxtNmEIIk4NDliZqn32U0lPfiqfmgbAlcqa MH3H7Qa7GlV7pXjhEHw2JluBe0cG29E06EkJduWy/+TsVf4PAKK/VzhCVkNdTuQG3UBgtvGHO AL5Mv0BCtzFsQKB3 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/net/wireless/intel/iwlegacy/3945.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.0 diff --git a/drivers/net/wireless/intel/iwlegacy/3945.c b/drivers/net/wireless/intel/iwlegacy/3945.c index 7bcedbb53d94..209dc9988455 100644 --- a/drivers/net/wireless/intel/iwlegacy/3945.c +++ b/drivers/net/wireless/intel/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);