| Message ID | 1463644741-529379-1-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2cce76c3fab410520610a7d2f52faebc3cfcf843 |
| Delegated to: | Kalle Valo |
| Headers | show |
On Thu, May 19, 2016 at 09:58:49AM +0200, Arnd Bergmann wrote: > 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 <arnd@arndb.de> Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Arnd Bergmann <arnd@arndb.de> wrote: > 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 <arnd@arndb.de> > Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> Thanks, 1 patch applied to wireless-drivers-next.git: 2cce76c3fab4 iwlegacy: avoid warning about missing braces
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);
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 <arnd@arndb.de> --- drivers/net/wireless/intel/iwlegacy/3945.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)