From patchwork Fri Jun 3 13:29:08 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: 9153059 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 216636072B for ; Fri, 3 Jun 2016 13:31:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 123A7282E8 for ; Fri, 3 Jun 2016 13:31:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0721C28304; Fri, 3 Jun 2016 13:31:37 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, 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 BACAD282E8 for ; Fri, 3 Jun 2016 13:31:36 +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 1b8pAX-0005nh-SS; Fri, 03 Jun 2016 13:29:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b8pAW-0005nH-2o for xen-devel@lists.xen.org; Fri, 03 Jun 2016 13:29:44 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id A3/C3-14119-74681575; Fri, 03 Jun 2016 13:29:43 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRWlGSWpSXmKPExsXiVRvkouvWFhh ucOy8scWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmrFq83z2godcFX0bn7A0MN7k6GLk4hASmMgo sfDfUWYQh0XgJYvEx+8LWLsYOTkkBPpZJTYcF4WwYySe3/3A2MXIAWRXSSxsSgEJCwmoS5x+t 4MNYtB0Jol/59aygCTYBEwk9v55wARiiwhIS1z7fJkRxGYW8JW4ufM4WFxYIFji7cNnYLtYBF QlHq28yQoyn1fAXaL3EDPEKjmJBRfSQSo4BTwknp96yQYSFgKqeHZPbQKjwAJGhlWMGsWpRWW pRbqGpnpJRZnpGSW5iZk5uoYGpnq5qcXFiempOYlJxXrJ+bmbGIEhxQAEOxgbtnseYpTkYFIS 5T1/NiBciC8pP6UyI7E4I76oNCe1+BCjDAeHkgTvkZbAcCHBotT01Iq0zBxgcMOkJTh4lER4o 1qB0rzFBYm5xZnpEKlTjLocW6beW8skxJKXn5cqJc67FWSGAEhRRmke3AhYpF1ilJUS5mUEOk qIpyC1KDezBFX+FaM4B6OSMO8nkCk8mXklcJteAR3BBHREwSN/kCNKEhFSUg2MLcp/9z5X0Y6 o2vavKvTjjJ8bk1b/s9xgGRvbr2d70q53v9Fco1uBOlbNfbY3ClhLPnzNLzuw87t/Y67JD+cV 4Yv64k22tz2XjuUK4lzsFnXlj/2TPTIsv1a7XjfdwVS3Z1Yq99ePjv1H4mWMpQLkKi68+/Nhu uGxz8yVipeKhX80srP3i25WYinOSDTUYi4qTgQA+03qF68CAAA= X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1464960582!43170128!1 X-Originating-IP: [74.125.82.68] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35493 invoked from network); 3 Jun 2016 13:29:42 -0000 Received: from mail-wm0-f68.google.com (HELO mail-wm0-f68.google.com) (74.125.82.68) by server-9.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 3 Jun 2016 13:29:42 -0000 Received: by mail-wm0-f68.google.com with SMTP id a20so12077586wma.3 for ; Fri, 03 Jun 2016 06:29:42 -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=Ow2UImwgC+WJVPS7QSQoLoWUEXRithRo7J/77s1el3w=; b=F4CXPYLEjFpsr881FJ7HxzB2e+0LC3Qs20TbpeBE/heodp+GFehQ9Nm9edKNtvXM6i UK0W9GshXKhi8vM59r6PObvLEnJTCftI/OE7kveSxIzZ1ioRbgYP2qt6rn8RXIe0WyQ6 v1IKE68B0KqO7qzmDbNKk1LF1BI0vHTSy+jKu2NBe2HoTTxLrR+hCVNAI12acwQE0c5h IrvLI1GQJoNhpmup33wnEHHibs/t7oCIsH/D1sUnw2T/JUQMlpowKxw8d1Z+enlJQZHq 64qvREEbwnKSddpYR+WOg+NCZ+vCKHepz/bZkamOtMeMm00LGCTijgy1YUXq+4WfYfjn 297Q== 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=Ow2UImwgC+WJVPS7QSQoLoWUEXRithRo7J/77s1el3w=; b=ENIEjb6L0wK41q2Lrv9DTOk1yfOUkHXTsdVRptEpPSIQlnRys1AF1l07ev7vQdkL+A LB3xKe0fh5Moq3V+k3/qlrYVVJa1e67ZqwuPn/UKoIvqvsjjimCHdZpYEpk138bEjJS0 0/JkISWbFPSPy0jajINl1hvdeUUdrrQ59+rEh0Xo8PDjSx3C+wI7s5qUG8/oIDirc7Fj fBP+8f0yHK+Ijx748zERNxAFUvU+HWH1DFFSbvpv2ZBc5IEctv4Wbfi6MIb1vjtq54z3 8fhR+7E0HWTHtCXEU3h//bbjFlxwxk7KK/RiFLbVb0cnCwTrIq5YPhNLSuYm45FAdtdN mWKg== X-Gm-Message-State: ALyK8tK25LE203u3GNlgtttEyAeou7Og7F6Dv59KDCmpdeUUgXlwjLKByuOsrOb/fUBGyw== X-Received: by 10.194.133.98 with SMTP id pb2mr3527791wjb.144.1464960582512; Fri, 03 Jun 2016 06:29:42 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id d5sm5771198wje.20.2016.06.03.06.29.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jun 2016 06:29:33 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Fri, 3 Jun 2016 15:29:08 +0200 Message-Id: <1464960552-6645-4-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464960552-6645-1-git-send-email-edgar.iglesias@gmail.com> References: <1464960552-6645-1-git-send-email-edgar.iglesias@gmail.com> Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [RFC for-4.8 v2 3/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. Signed-off-by: Edgar E. Iglesias Acked-by: Julien Grall --- 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 e3fe77c..b348913 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -33,10 +33,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;