From patchwork Fri Sep 23 18:53:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 9348599 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 EE4D0607D0 for ; Fri, 23 Sep 2016 18:55:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAA712AD53 for ; Fri, 23 Sep 2016 18:55:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF8232AD6A; Fri, 23 Sep 2016 18:55:46 +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=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 74F072AD53 for ; Fri, 23 Sep 2016 18:55:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bnVbI-0005am-Gq; Fri, 23 Sep 2016 18:53:32 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bnVbH-0005aC-0H for xen-devel@lists.xen.org; Fri, 23 Sep 2016 18:53:31 +0000 Received: from [85.158.143.35] by server-4.bemta-6.messagelabs.com id E9/11-29421-A2A75E75; Fri, 23 Sep 2016 18:53:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAIsWRWlGSWpSXmKPExsXiVRvkrKtZ9TT cYG2fhsWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmvFt+2aWgn7uihtXVjM1MDZzdjFycQgJTGSU WHXvBzuIwyLwkkVizbPfTCCOhEA/q8SBZWvYuhg5gJwYiaO3mLsYOYHMcombnzczgdhCAuoSp 9/tYIOYNJ1JYtn+TrAEm4CJxN4/D8BsEQFpiWufLzOC2MwCvhI3dx4HiwsD2fNmXQEbyiKgKn Hv7HewOK+Ah8TRff1sEMvkJG6e6wSr4RTwlNjYvwFqsYfEj33/2CcwCixgZFjFqFGcWlSWWqR rZKGXVJSZnlGSm5iZo2toYKaXm1pcnJiempOYVKyXnJ+7iREYWgxAsIPx/NrAQ4ySHExKorxK bk/DhfiS8lMqMxKLM+KLSnNSiw8xynBwKEnwOhgA5QSLUtNTK9Iyc4BBDpOW4OBREuEVqwRK8 xYXJOYWZ6ZDpE4x6nJsmXpvLZMQS15+XqqUOC8vSJEASFFGaR7cCFjEXWKUlRLmZQQ6SoinIL UoN7MEVf4VozgHo5IwrzfIFJ7MvBK4Ta+AjmACOuLbnScgR5QkIqSkGhhZcpaY/7426d2y13c q9yhO9paUk2Aw08qqe2ewUXaBpIzuP7XQqE6+Fm1L/j9HAt8rHdy970rJm4ifC878n2DlbO7C 5G0UYST3L3idq9iK+FXtO9KjbM5w7rMwdoi/8v5SCv+thKYzZvtTV1syu2nNOSIqp98f2Nzn7 fxkdtzF/L/HVB/+4ldiKc5INNRiLipOBACv2jC0swIAAA== X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1474656809!34808717!1 X-Originating-IP: [74.125.82.67] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42719 invoked from network); 23 Sep 2016 18:53:29 -0000 Received: from mail-wm0-f67.google.com (HELO mail-wm0-f67.google.com) (74.125.82.67) by server-13.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 23 Sep 2016 18:53:29 -0000 Received: by mail-wm0-f67.google.com with SMTP id l132so4118498wmf.1 for ; Fri, 23 Sep 2016 11:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xfcQ16jaxzUoaUTQ26c2LsG/LqGO5qDQfav21AjR3KE=; b=ia6mOYlENRpzn4Loa98+2x4SFg2SI1TF+mnxXWZjA1/JGtTD3sa5DX5atc9Lf7jZ+J ar7JhsB1RVqoyzJvKaIlbqrtrMXXjehR6pK+uNPL/1J6IFxMX0Ecc/SbTF2rg3UOF1Qw SinDUX5GmnGslNmZLcOFnC2wRczNgeYgyUH0KWyxXY735RpKJYkw1hocPia6K3zU0nHm lENyNzNC6xD6plqsZjXG433bUEE/EwB846dV2H//MNgMfUYT6g8cJM3LNP+fuNuTPV3A yZOnGXS4JllVb1mYAmdJsT/opaAMq+8GV0Q5q7rYGiO0FoLdNzI5MzjYW2gFiRw1rsxa khLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xfcQ16jaxzUoaUTQ26c2LsG/LqGO5qDQfav21AjR3KE=; b=ASqTifpJ6hqEOahD50K43UshylzWVgHI8BBlnzdXBphct64pF0Bio8cvXqPZYnad52 zFHGpGVOBkvuw4GjhrJ6q8QCZyiqaus9Wcwm0nUaYMwaIk3H6oflcM/EEDjjZa7m6b++ oG67uqZLK8ZmlAxCrdocWwH+NJBlJ9pGNx/+kfBvYymKEFQtZrzgxqy3tgsxrvsW4DWw QwwxCTu1oL/0TR6PbuEt4i/o4hnk8IGHGJvMZRbfQOT6DMigC8rV9suv8PReT5mgx3HH fTwyXMLipmz8f1hfNp5AVMT81kK20NvKKEjdd8UdjhdedAwvA+qVSRmzZQvYVygkTKnK ULKA== X-Gm-Message-State: AA6/9Rn2Wm6f7PI0ty+PmksEZGBsz+TDwrrhdBG2w1Vu0EbZjY9R47rVPwv1F+f3Z9Niqw== X-Received: by 10.28.97.69 with SMTP id v66mr3998962wmb.12.1474656809286; Fri, 23 Sep 2016 11:53:29 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id n7sm8477728wjz.32.2016.09.23.11.53.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Sep 2016 11:53:28 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Fri, 23 Sep 2016 20:53:19 +0200 Message-Id: <1474656802-24081-5-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474656802-24081-1-git-send-email-edgar.iglesias@gmail.com> References: <1474656802-24081-1-git-send-email-edgar.iglesias@gmail.com> Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [PATCH v4 4/7] xen/device-tree: Add __DT_MATCH macros without braces X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Add __DT_MATCH macros without braces to allow the creation of match descriptors with multiple combined match options. Acked-by: Julien Grall Signed-off-by: Edgar E. Iglesias --- xen/include/xen/device_tree.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 3657ac2..da153a5 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -32,10 +32,15 @@ struct dt_device_match { const void *data; }; -#define DT_MATCH_PATH(p) { .path = p } -#define DT_MATCH_TYPE(typ) { .type = typ } -#define DT_MATCH_COMPATIBLE(compat) { .compatible = compat } -#define DT_MATCH_NOT_AVAILABLE() { .not_available = 1 } +#define __DT_MATCH_PATH(p) .path = p +#define __DT_MATCH_TYPE(typ) .type = typ +#define __DT_MATCH_COMPATIBLE(compat) .compatible = compat +#define __DT_MATCH_NOT_AVAILABLE() .not_available = 1 + +#define DT_MATCH_PATH(p) { __DT_MATCH_PATH(p) } +#define DT_MATCH_TYPE(typ) { __DT_MATCH_TYPE(typ) } +#define DT_MATCH_COMPATIBLE(compat) { __DT_MATCH_COMPATIBLE(compat) } +#define DT_MATCH_NOT_AVAILABLE() { __DT_MATCH_NOT_AVAILABLE() } typedef u32 dt_phandle;