From patchwork Wed Mar 22 13:26:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 9640203 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 A01A66020B for ; Wed, 22 Mar 2017 22:26:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 932C428459 for ; Wed, 22 Mar 2017 22:26:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 874B828485; Wed, 22 Mar 2017 22:26:45 +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.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 43B4528459 for ; Wed, 22 Mar 2017 22:26:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C93F96E99E; Wed, 22 Mar 2017 22:26:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ot0-f196.google.com (mail-ot0-f196.google.com [74.125.82.196]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4AEAC8924A for ; Wed, 22 Mar 2017 13:26:15 +0000 (UTC) Received: by mail-ot0-f196.google.com with SMTP id i1so25661984ota.3 for ; Wed, 22 Mar 2017 06:26:15 -0700 (PDT) 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:in-reply-to :references; bh=NehuID9KYYHH9I8yjy2sOCLCtdQPYYVme2c5oaJPFHc=; b=WWrFpCgf0ovSWOVLACNhEjNirRXarQhbeDs5b9W1BHIEBlJkjjTVmZxjl3qCLAxVn/ L+FR0bSG2z/VsRpzJ61yv8jTBj6FTcVEY2BfJfkCpGQke2Jm/OlkJaZSuSvN11EEYb/Q CtfzxWYWc3s4ZjC1+VY3ZJxkCMQmGsI+0QmaO8+Qjm57eMbVikiM9/0+qTgTIFxFmZXK GPlf8VAjQW3s816k0n6WM2jgr/YNJAjuRZs3PzZFWVQs84pf8Wv0HdI6EIAQ9tLOTaOn 3yzwLbdiufOoliYCmy6ePRgz25uifdQanIDVapfpcTgDc8EyRF0XphGoDV/wKrXmhPY9 rjkg== X-Gm-Message-State: AFeK/H3cBx5RQb4Acy1hem7KCINKF7oRUQgIPCvWvdstCk2M2hmeGc1FHsxPjIHnyfr0VA== X-Received: by 10.157.29.248 with SMTP id w53mr14848719otw.230.1490189173689; Wed, 22 Mar 2017 06:26:13 -0700 (PDT) Received: from rob-hp-laptop.herring.priv (66-90-148-125.dyn.grandenetworks.net. [66.90.148.125]) by smtp.googlemail.com with ESMTPSA id x133sm509132oif.33.2017.03.22.06.26.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 06:26:13 -0700 (PDT) From: Rob Herring To: David Airlie , Daniel Vetter , Sean Paul Subject: [PATCH v3 1/5] drm: make of_drm_find_panel also depend on CONFIG_DRM_PANEL Date: Wed, 22 Mar 2017 08:26:04 -0500 Message-Id: <20170322132608.17353-2-robh@kernel.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170322132608.17353-1-robh@kernel.org> References: <20170322132608.17353-1-robh@kernel.org> X-Mailman-Approved-At: Wed, 22 Mar 2017 22:26:39 +0000 Cc: Neil Armstrong , Liviu Dudau , dri-devel@lists.freedesktop.org, Tomi Valkeinen , Marek Vasut , Kevin Hilman , Chen-Yu Tsai , Krzysztof Kozlowski , Xinliang Liu , Javier Martinez Canillas , Xinwei Kong , Kukjin Kim , Mali DP Maintainers , Chen Feng , Jyri Sarha , Carlo Caione , Russell King , Matthias Brugger , Alison Wang , Jingoo Han , Seung-Woo Kim , linux-kernel@vger.kernel.org, Kyungmin Park , Rongrong Zou , Maxime Ripard X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP For drm_of_find_panel_or_bridge() added in the next commit, an empty version of of_drm_find_panel is needed for !CONFIG_DRM_PANEL. Signed-off-by: Rob Herring Reviewed-by: Eric Anholt --- v3: - rebase to v4.11-rc2 include/drm/drm_panel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.10.1 diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h index 4b76cf2d5a7b..1b364b0100f4 100644 --- a/include/drm/drm_panel.h +++ b/include/drm/drm_panel.h @@ -192,7 +192,7 @@ void drm_panel_remove(struct drm_panel *panel); int drm_panel_attach(struct drm_panel *panel, struct drm_connector *connector); int drm_panel_detach(struct drm_panel *panel); -#ifdef CONFIG_OF +#if defined(CONFIG_OF) && defined(CONFIG_DRM_PANEL) struct drm_panel *of_drm_find_panel(const struct device_node *np); #else static inline struct drm_panel *of_drm_find_panel(const struct device_node *np)