From patchwork Wed Sep 7 06:56:14 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: 9318295 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 2C0586077F for ; Wed, 7 Sep 2016 06:58:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 209FB2907D for ; Wed, 7 Sep 2016 06:58:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 157AF2909B; Wed, 7 Sep 2016 06:58:23 +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 C4A4D2907D for ; Wed, 7 Sep 2016 06:58:22 +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 1bhWmf-00006H-Qs; Wed, 07 Sep 2016 06:56:33 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhWme-00005g-WD for xen-devel@lists.xen.org; Wed, 07 Sep 2016 06:56:33 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id 76/E4-04595-02ABFC75; Wed, 07 Sep 2016 06:56:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRWlGSWpSXmKPExsVyMfTAQV35Xef DDb7N07dY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDN+7rnCXtDPXfHty022BsZmzi5GLg4hgQmM Eh9OTmUFcVgEXrJI7NpziAnEkRDoZ5VY+XQ+cxcjJ5ATI/Fy2Xt2CLta4vCpbYwgtpCAusTpd zvYIEY9ZJRYvHAHWAObgInE3j8PmEBsEQFpiWufL4M1MAv4StzceRwsLgxkz2iHqGcRUJXYvu waWA2vgLvEgRPPmSCWyUmcPDaZFcTmFPCQmLn9JTvEYneJPZ+mMk9gFFjAyLCKUaM4tagstUj XyFwvqSgzPaMkNzEzR9fQwEwvN7W4ODE9NScxqVgvOT93EyMwuBiAYAfj4rWBhxglOZiURHm3 TjofLsSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mCd/sOoJxgUWp6akVaZg4wzGHSEhw8SiK8s0HSv MUFibnFmekQqVOMlhxbfl9by8SxbPMdILlt6r21TEIsefl5qVLivMEgDQIgDRmleXDjYLF4iV FWSpiXEehAIZ6C1KLczBJU+VeM4hyMSsK8OSBTeDLzSuC2vgI6iAnooHW7T4McVJKIkJJqYOQ 7bbDYc77UzKtNQnyXxNee0gk1yrz0Qcy9KG7RUT8lVvcPX9t/fpmUfvgUq6tbzc8dK+JFbzVH BczK8Orq6j+RYukwac8bTcdMts1PsxmdHly79VJZUOOKEsepi/9ervDwsm3Tc6yRrVipsr9EV oZpm4rDLIG6d/PmRzz6tGphAtct6b5/z5RYijMSDbWYi4oTAYo2dWnAAgAA X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1473231390!58006184!1 X-Originating-IP: [209.85.192.193] 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 28023 invoked from network); 7 Sep 2016 06:56:31 -0000 Received: from mail-pf0-f193.google.com (HELO mail-pf0-f193.google.com) (209.85.192.193) by server-5.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 7 Sep 2016 06:56:31 -0000 Received: by mail-pf0-f193.google.com with SMTP id x24so450021pfa.3 for ; Tue, 06 Sep 2016 23:56:31 -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=SFAYMOtkDzz74jiEJFAwunwXH+yzk7CjTHtvamdpq3g=; b=nxZwm9hcbYMZShxEU1017YCj0WSl3ZwK0gAp+1PSvaS14BnUbyZBzhzBuzOrCkqGuJ rV9FUgjJL4+k1cLrY0tER5/fDi4WvU4KernSi1nsK2x1whO5rWuBmyrfAarSkShA46RQ ms3JQ/W0LWZwQGZ1bj8djYwV3uLIqKSqNKpUh3I/2wcjBNjM5VJP7U1Pg2ghU6FJt8/Q 1FQSB54anGzgMh2jjtaRJ8xWaLr9myHHe88J22Knoorf1Dh8t5Dvr0R3geLJwUbtU9O7 AeZX86SAkfi43fk4PGgJgCK2QugqziyNqCthPWH+2CUqvzxaY8xpJrTqLOrFI4JH0XCT ZQZA== 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=SFAYMOtkDzz74jiEJFAwunwXH+yzk7CjTHtvamdpq3g=; b=Wyv5JVIGK6+KprpPc+1OhPGi1gS+GlSWOYyfQ7O8yhCtcw2Uat+kEf96fOytQ3nLz3 i3UMxDX/8tIGYbzAMkOwEgfyYG4Mebml/5ISM1ZgllXniUU3WZQWMGMNP3iSkuAGKJJf hsJ4whlUsjeSAZN7+9UBUbSCN+ld0eZkKcygRPVVp144aiFBk1VCetVvpeDUjjIzM3aE MEa/w4BNth92wGYvP0A/PNso6SN+cZdHokbLO/uAUqINo3oy3/W96MHXbOEQgIoaJP2+ pigsr2Al3L9nyAo2U+Hiyfq+edaVjoA7SrkarZkguXYEfO3PJ7l8MuQ8nN+gUMBbhjUz fuOg== X-Gm-Message-State: AE9vXwOWuD8EkgzeeZorCXN9DL0xTHlYApnVqoKw7u1f+r1AdlCrz8SQUFshdoBH1yBfnw== X-Received: by 10.98.46.199 with SMTP id u190mr62365801pfu.160.1473231389854; Tue, 06 Sep 2016 23:56:29 -0700 (PDT) Received: from localhost ([40.140.7.61]) by smtp.gmail.com with ESMTPSA id tq5sm13994219pac.42.2016.09.06.23.56.28 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 06 Sep 2016 23:56:29 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Wed, 7 Sep 2016 08:56:14 +0200 Message-Id: <1473231377-7800-4-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473231377-7800-1-git-send-email-edgar.iglesias@gmail.com> References: <1473231377-7800-1-git-send-email-edgar.iglesias@gmail.com> Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [PATCH v3 3/6] 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;