From patchwork Thu Dec 22 19:18:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 88891 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp2968831qgi; Thu, 22 Dec 2016 11:19:26 -0800 (PST) X-Received: by 10.55.17.68 with SMTP id b65mr11431482qkh.60.1482434366206; Thu, 22 Dec 2016 11:19:26 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o24si8294821qko.328.2016.12.22.11.19.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 22 Dec 2016 11:19:26 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:35858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cK8th-00032B-QZ for patch@linaro.org; Thu, 22 Dec 2016 14:19:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cK8sb-0002jZ-JW for qemu-devel@nongnu.org; Thu, 22 Dec 2016 14:18:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cK8sY-0000a7-Bd for qemu-devel@nongnu.org; Thu, 22 Dec 2016 14:18:17 -0500 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:36357) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cK8sY-0000ZM-4m for qemu-devel@nongnu.org; Thu, 22 Dec 2016 14:18:14 -0500 Received: by mail-pf0-x241.google.com with SMTP id c4so12812891pfb.3 for ; Thu, 22 Dec 2016 11:18:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ED8CewXI3OytS4FlTsgJtNkBs3Wyn5qCDcDGx0EFjgI=; b=ro951bqgJdOg8WkqUnHwIZqG715ylo9AZJv16PYpAs27aJMlnMhMg7zayK7m4L6NKU 88T2s83MzoCCqTtDKFtlJsVQhJll07MdaVioFYIDMmJ0FSw489RiRciySTTQMOfu+e4V T38DzqSbdBDnD8wXsoPums8N+vtC3pQoGidqw66eKmm/M4U2So1ykaiwJShzSMNTgM5q rM9MnQBalkbJX0zvupdQJspDq/F+vEFEGlApJzCcKcN3PeS384pjwJbLXrMnKpBaLXsl SasvbZJFLBZA4fypY69JAEtvc6JCGpkPxuOTe7LcV4oiLtu7CLLzBffx/t1uUtKApDKU jkOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ED8CewXI3OytS4FlTsgJtNkBs3Wyn5qCDcDGx0EFjgI=; b=QBKW3Kw/ykLcrBxcYPXuuDLLobUku7052Mb+k+dA36F/tobWQCmU5F5weEj1YwyDET FrpCzbfve+p58/alKjZb2nsoTwgqrnZfuqQ/w1aO0ir7yMjRobxXiTBpNyDksdFQnYR9 TqK+r+5Bkkx7u9ptKBRF8Gt3zmhf5/bX6ifAHHOxnTEe8G5xPLzy++sMAaF0vZ2L1vOx qkx/WrJjbX/ClGX6GqtndF2ZF8t9C0H5+85mhNrvff58DML8NENkON5CMN+g/SWUsvZK vQusbTS5t/VfNaL+083x2jye/CwtfjbCEt+atbHAU0OlcKG2k/fcUud59IvuE0WUuOOv delQ== X-Gm-Message-State: AIkVDXKzRh8uJEXUDKCgK1Qz3K93ro3pD/dvShmTI1dZQXi65bCZlbBVDMTr3p0UDarV9A== X-Received: by 10.84.215.194 with SMTP id g2mr22429989plj.16.1482434293137; Thu, 22 Dec 2016 11:18:13 -0800 (PST) Received: from serve.minyard.net ([47.184.183.230]) by smtp.gmail.com with ESMTPSA id x90sm56543262pfk.73.2016.12.22.11.18.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Dec 2016 11:18:12 -0800 (PST) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:5572:ad87:9d15:4a12]) by serve.minyard.net (Postfix) with ESMTPA id B2FC19D9; Thu, 22 Dec 2016 13:18:10 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 18115302F72; Thu, 22 Dec 2016 13:18:10 -0600 (CST) From: minyard@acm.org To: Bug 1651167 <1651167@bugs.launchpad.net>, qemu-devel@nongnu.org, Eric Blake Date: Thu, 22 Dec 2016 13:18:07 -0600 Message-Id: <1482434287-26044-1-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20161219154752.14563.46483.malonedeb@wampee.canonical.com> References: <20161219154752.14563.46483.malonedeb@wampee.canonical.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH v2] ipmi: Fix macro issues X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard Macro parameters should almost always have () around them when used. llvm reported an error on this. Remove redundant parenthesis and put parenthesis around the entire macros with assignments in case they are used in an expression. Remove some unused macros. Reported in https://bugs.launchpad.net/bugs/1651167 Signed-off-by: Corey Minyard --- hw/ipmi/isa_ipmi_bt.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) Changes in v2: * Put parenthesis around macros that had assignment in them. * Removed some redundant parenthesis. * Removed some macros that were not used. -- 2.7.4 Reviewed-by: Eric Blake diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index f036617..68bf5cd 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -37,40 +37,30 @@ #define IPMI_BT_HBUSY_BIT 6 #define IPMI_BT_BBUSY_BIT 7 -#define IPMI_BT_CLR_WR_MASK (1 << IPMI_BT_CLR_WR_BIT) #define IPMI_BT_GET_CLR_WR(d) (((d) >> IPMI_BT_CLR_WR_BIT) & 0x1) -#define IPMI_BT_SET_CLR_WR(d, v) (d) = (((d) & ~IPMI_BT_CLR_WR_MASK) | \ - (((v & 1) << IPMI_BT_CLR_WR_BIT))) -#define IPMI_BT_CLR_RD_MASK (1 << IPMI_BT_CLR_RD_BIT) #define IPMI_BT_GET_CLR_RD(d) (((d) >> IPMI_BT_CLR_RD_BIT) & 0x1) -#define IPMI_BT_SET_CLR_RD(d, v) (d) = (((d) & ~IPMI_BT_CLR_RD_MASK) | \ - (((v & 1) << IPMI_BT_CLR_RD_BIT))) -#define IPMI_BT_H2B_ATN_MASK (1 << IPMI_BT_H2B_ATN_BIT) #define IPMI_BT_GET_H2B_ATN(d) (((d) >> IPMI_BT_H2B_ATN_BIT) & 0x1) -#define IPMI_BT_SET_H2B_ATN(d, v) (d) = (((d) & ~IPMI_BT_H2B_ATN_MASK) | \ - (((v & 1) << IPMI_BT_H2B_ATN_BIT))) #define IPMI_BT_B2H_ATN_MASK (1 << IPMI_BT_B2H_ATN_BIT) #define IPMI_BT_GET_B2H_ATN(d) (((d) >> IPMI_BT_B2H_ATN_BIT) & 0x1) -#define IPMI_BT_SET_B2H_ATN(d, v) (d) = (((d) & ~IPMI_BT_B2H_ATN_MASK) | \ - (((v & 1) << IPMI_BT_B2H_ATN_BIT))) +#define IPMI_BT_SET_B2H_ATN(d, v) ((d) = (((d) & ~IPMI_BT_B2H_ATN_MASK) | \ + (((v) & 1) << IPMI_BT_B2H_ATN_BIT))) #define IPMI_BT_SMS_ATN_MASK (1 << IPMI_BT_SMS_ATN_BIT) #define IPMI_BT_GET_SMS_ATN(d) (((d) >> IPMI_BT_SMS_ATN_BIT) & 0x1) -#define IPMI_BT_SET_SMS_ATN(d, v) (d) = (((d) & ~IPMI_BT_SMS_ATN_MASK) | \ - (((v & 1) << IPMI_BT_SMS_ATN_BIT))) +#define IPMI_BT_SET_SMS_ATN(d, v) ((d) = (((d) & ~IPMI_BT_SMS_ATN_MASK) | \ + (((v) & 1) << IPMI_BT_SMS_ATN_BIT))) #define IPMI_BT_HBUSY_MASK (1 << IPMI_BT_HBUSY_BIT) #define IPMI_BT_GET_HBUSY(d) (((d) >> IPMI_BT_HBUSY_BIT) & 0x1) -#define IPMI_BT_SET_HBUSY(d, v) (d) = (((d) & ~IPMI_BT_HBUSY_MASK) | \ - (((v & 1) << IPMI_BT_HBUSY_BIT))) +#define IPMI_BT_SET_HBUSY(d, v) ((d) = (((d) & ~IPMI_BT_HBUSY_MASK) | \ + (((v) & 1) << IPMI_BT_HBUSY_BIT))) #define IPMI_BT_BBUSY_MASK (1 << IPMI_BT_BBUSY_BIT) -#define IPMI_BT_GET_BBUSY(d) (((d) >> IPMI_BT_BBUSY_BIT) & 0x1) -#define IPMI_BT_SET_BBUSY(d, v) (d) = (((d) & ~IPMI_BT_BBUSY_MASK) | \ - (((v & 1) << IPMI_BT_BBUSY_BIT))) +#define IPMI_BT_SET_BBUSY(d, v) ((d) = (((d) & ~IPMI_BT_BBUSY_MASK) | \ + (((v) & 1) << IPMI_BT_BBUSY_BIT))) /* Mask register */ @@ -79,13 +69,13 @@ #define IPMI_BT_B2H_IRQ_EN_MASK (1 << IPMI_BT_B2H_IRQ_EN_BIT) #define IPMI_BT_GET_B2H_IRQ_EN(d) (((d) >> IPMI_BT_B2H_IRQ_EN_BIT) & 0x1) -#define IPMI_BT_SET_B2H_IRQ_EN(d, v) (d) = (((d) & ~IPMI_BT_B2H_IRQ_EN_MASK) | \ - (((v & 1) << IPMI_BT_B2H_IRQ_EN_BIT))) +#define IPMI_BT_SET_B2H_IRQ_EN(d, v) ((d) = (((d) & ~IPMI_BT_B2H_IRQ_EN_MASK) |\ + (((v) & 1) << IPMI_BT_B2H_IRQ_EN_BIT))) #define IPMI_BT_B2H_IRQ_MASK (1 << IPMI_BT_B2H_IRQ_BIT) #define IPMI_BT_GET_B2H_IRQ(d) (((d) >> IPMI_BT_B2H_IRQ_BIT) & 0x1) -#define IPMI_BT_SET_B2H_IRQ(d, v) (d) = (((d) & ~IPMI_BT_B2H_IRQ_MASK) | \ - (((v & 1) << IPMI_BT_B2H_IRQ_BIT))) +#define IPMI_BT_SET_B2H_IRQ(d, v) ((d) = (((d) & ~IPMI_BT_B2H_IRQ_MASK) | \ + (((v) & 1) << IPMI_BT_B2H_IRQ_BIT))) typedef struct IPMIBT { IPMIBmc *bmc;