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: 95720 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp238080qgd; Wed, 22 Mar 2017 06:28:30 -0700 (PDT) X-Received: by 10.99.127.23 with SMTP id a23mr26987116pgd.155.1490189310326; Wed, 22 Mar 2017 06:28:30 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z64si1834980pgz.214.2017.03.22.06.28.30; Wed, 22 Mar 2017 06:28:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759532AbdCVN2X (ORCPT + 12 others); Wed, 22 Mar 2017 09:28:23 -0400 Received: from mail-ot0-f195.google.com ([74.125.82.195]:34730 "EHLO mail-ot0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934588AbdCVN0Z (ORCPT ); Wed, 22 Mar 2017 09:26:25 -0400 Received: by mail-ot0-f195.google.com with SMTP id y88so2563676ota.1 for ; Wed, 22 Mar 2017 06:26:19 -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=Salx747O99fAF+MoJ8tZIgMtU7Y1hnxYbFdS3f/hGNeouagLQBQuqjMYfCvXIqsGNF 27ao72SdWDWHClfw1n8VwFLp/maCFtvACRZAV76wku3Pm1SXVaHL8AOzFEANOejaxnnA AodVwbV9rfbYtKoz4+5SmqAAfcNOIK7LWgxS4HwJoKdWMDfzNnfKy80XIthnLVnKz0Fz HxYPbx1xgyt957fftLpSPmEbyccv5qlL9C0VsTZAQ5GuushTnpx+V2RxIpg3bdJqbZTA fbm2E/vkDGAwqGJjQMeVCx+Qqk2+xs7dQnhjlwcIio+3cuFbuCYWJogbYhtvTKzAcAV6 zJUA== X-Gm-Message-State: AFeK/H3/OHd7cvIdvREIbhhFFpSQrF/IpkgprA3f9BF3VaSw2ZakDH6Js1WgBKIbauQ2lg== 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 Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Boris Brezillon , Archit Taneja , Jingoo Han , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Kukjin Kim , Krzysztof Kozlowski , Javier Martinez Canillas , Stefan Agner , Alison Wang , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , Philipp Zabel , CK Hu , Matthias Brugger , Marek Vasut , Mark Yao , Heiko Stuebner , Maxime Ripard , Chen-Yu Tsai , Liviu Dudau , Mali DP Maintainers , Neil Armstrong , Carlo Caione , Kevin Hilman , Rob Clark , Jyri Sarha , Tomi Valkeinen , Eric Anholt , Russell King 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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)