From patchwork Wed Feb 22 08:15:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Rokicki X-Patchwork-Id: 9586355 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5AB7A602A7 for ; Wed, 22 Feb 2017 08:15:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4083328502 for ; Wed, 22 Feb 2017 08:15:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 358382853C; Wed, 22 Feb 2017 08:15:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9522F28502 for ; Wed, 22 Feb 2017 08:15:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754096AbdBVIPd (ORCPT ); Wed, 22 Feb 2017 03:15:33 -0500 Received: from mail-lf0-f42.google.com ([209.85.215.42]:34828 "EHLO mail-lf0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753318AbdBVIPc (ORCPT ); Wed, 22 Feb 2017 03:15:32 -0500 Received: by mail-lf0-f42.google.com with SMTP id z127so2070243lfa.2 for ; Wed, 22 Feb 2017 00:15:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=kI2DNjl6Rd6Vm7Lqn2rL7ZttWSYTNMNi9xYTDKmNM+k=; b=0EGDUPqbbSM0Vi3cRDSZenQ+cVFvudSdW196EChx8FVD4T0BcwR68vhjYdvjFT273Q l1eDl7TY602lUUqFmuJqlJPQXrj0ph/lyVPRuuSUx6/tdsU+lX6FC1eoqRnIRxTq8duK /7JUkn5SREwNyuU4t8lKffOiHKaIOvke8exEw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kI2DNjl6Rd6Vm7Lqn2rL7ZttWSYTNMNi9xYTDKmNM+k=; b=lcNZLeTY7WMfBaMQrgl5OLeiIeVHKGjS0WCWJXSvD3s6uomS69KvKjsQD4sYygr0uF y1l1RrQzn6dIA5M2dr986AyiquyMhgPOqB4XB22MysNTCN05gaxRufKfU2bsU9qq2eB1 ybxNi5vKL1p72OI0boCWtdRuaPYYxwNQRr0c6AHAfzOYkl0wMZ7K3LLca9d8Hkzw5kAb J6Jt++oYmTSFv5AZuil/t2wMcdpZH55T9luxFnAuzkaiX/hboD2Z6v/qxXd08keQk5Qs kwczlKEuzUI17tgNUAa2tJXYQBrP0pkCdqdNAzMglIF4IFf6eFtN64Evf2sCchtR/csr EYjQ== X-Gm-Message-State: AMke39l4kD38MqeYzgOaoIR9OY8Bga12gHmhPLr9mbP1nEY7CUlrVYdQOiqRoCVaRsAivHQnd15PT01IIdfDxK+FzrbMWZxP1mtbbWGA90NpfjNH1bZcGRXdFZu9hcXI/A7qhEdHFr8Rzg== X-Received: by 10.25.10.6 with SMTP id 6mr9495204lfk.88.1487751330028; Wed, 22 Feb 2017 00:15:30 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by smtp.gmail.com with ESMTPSA id b7sm164081lfe.33.2017.02.22.00.15.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Feb 2017 00:15:29 -0800 (PST) From: Marcin Rokicki To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH] ath10k: Modify macros to fix style issues Date: Wed, 22 Feb 2017 09:15:27 +0100 Message-Id: <1487751327-2917-1-git-send-email-marcin.rokicki@tieto.com> X-Mailer: git-send-email 2.7.4 X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Both macros are used internally to convert incomming parameters to strings in a switch case statement. Current implementation gives following output from checkpatch.pl: - ERROR: Macros with complex values should be enclosed in parentheses - WARNING: Macros with flow control statements should be avoided Fix them by modify local variable in the middle and just return at the end. Btw add const to function that return string literals Signed-off-by: Marcin Rokicki --- drivers/net/wireless/ath/ath10k/wmi.h | 36 +++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index 427220c..0bf578f 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -312,9 +312,16 @@ enum wmi_10_4_service { WMI_10_4_SERVICE_TX_MODE_DYNAMIC, }; -static inline char *wmi_service_name(int service_id) +#define SVCSTR(x) \ +{ \ + case x: \ + str = #x; \ + break; \ +} + +static inline const char *wmi_service_name(int service_id) { -#define SVCSTR(x) case x: return #x + const char *str = NULL; switch (service_id) { SVCSTR(WMI_SERVICE_BEACON_OFFLOAD); @@ -408,13 +415,13 @@ static inline char *wmi_service_name(int service_id) SVCSTR(WMI_SERVICE_TX_MODE_PUSH_ONLY); SVCSTR(WMI_SERVICE_TX_MODE_PUSH_PULL); SVCSTR(WMI_SERVICE_TX_MODE_DYNAMIC); - default: - return NULL; } -#undef SVCSTR + return str; } +#undef SVCSTR + #define WMI_SERVICE_IS_ENABLED(wmi_svc_bmap, svc_id, len) \ ((svc_id) < (len) && \ __le32_to_cpu((wmi_svc_bmap)[(svc_id) / (sizeof(u32))]) & \ @@ -6412,10 +6419,17 @@ enum wmi_wow_wakeup_event { WOW_EVENT_MAX, }; -#define C2S(x) case x: return #x +#define C2S(x) \ +{ \ + case x: \ + str = #x; \ + break; \ +} static inline const char *wow_wakeup_event(enum wmi_wow_wakeup_event ev) { + const char *str = NULL; + switch (ev) { C2S(WOW_BMISS_EVENT); C2S(WOW_BETTER_AP_EVENT); @@ -6442,9 +6456,9 @@ static inline const char *wow_wakeup_event(enum wmi_wow_wakeup_event ev) C2S(WOW_BEACON_EVENT); C2S(WOW_CLIENT_KICKOUT_EVENT); C2S(WOW_EVENT_MAX); - default: - return NULL; } + + return str; } enum wmi_wow_wake_reason { @@ -6482,6 +6496,8 @@ enum wmi_wow_wake_reason { static inline const char *wow_reason(enum wmi_wow_wake_reason reason) { + const char *str = NULL; + switch (reason) { C2S(WOW_REASON_UNSPECIFIED); C2S(WOW_REASON_NLOD); @@ -6513,9 +6529,9 @@ static inline const char *wow_reason(enum wmi_wow_wake_reason reason) C2S(WOW_REASON_BEACON_RECV); C2S(WOW_REASON_CLIENT_KICKOUT_EVENT); C2S(WOW_REASON_DEBUG_TEST); - default: - return NULL; } + + return str; } #undef C2S