From patchwork Mon Jan 23 12:20:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9532439 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 E3E056042F for ; Mon, 23 Jan 2017 12:28:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB12627B2F for ; Mon, 23 Jan 2017 12:28:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC20B28304; Mon, 23 Jan 2017 12:28:56 +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 650D627B2F for ; Mon, 23 Jan 2017 12:28:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D3EC6E527; Mon, 23 Jan 2017 12:28:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 318 seconds by postgrey-1.35 at gabe; Mon, 23 Jan 2017 12:28:54 UTC Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5ABFE6E527 for ; Mon, 23 Jan 2017 12:28:54 +0000 (UTC) Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MNQhV-1cbxAp0dAH-006x4U; Mon, 23 Jan 2017 13:23:22 +0100 From: Arnd Bergmann To: Archit Taneja Subject: [PATCH] drm: bridge: dw-hdmi: fix building without CONFIG_OF Date: Mon, 23 Jan 2017 13:20:38 +0100 Message-Id: <20170123122312.3290934-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:mCw4/Sy4uEPkhci0R6YtvIxtH6Hu/ZSmg467eylENSD0OHRWGgD CioqtLYPtajCS9pheKf4pZGuG9804so7oNsv9cBFR1zLDbSDtjcXIoM7RCFrRaXcPP25lN1 JOwJS3wKfXCWyTOfh3khBBuHXthnhwOrc+XMs+TVwwK+bG6fqRo24QFfNyvC4oGWuwqv/f6 4bO7F01mCzFtZYv9opoMg== X-UI-Out-Filterresults: notjunk:1; V01:K0:gF0YAA0W450=:VbvhIh9ivEiIaC5BXZBbo3 4wGUgBo3Idrv5yJzNTC/K9uE8KrgEpubB8W5Al0rlkdCQL8fIAagXoNcVKQT8GXx5w8rD5QBz hX9yGbFoDRlZKLiolyfk+eXNFT+6bB3Bs0RAtDUAJURerekDmy9vo9aHA2ZNcWFDjc8+hIJ3o FOCT5sH2SH5kGhr8LyUjh0F0I38yXNC8lzpGtUUma32opwXuOKWHXKxfC8HXDYgxAU62TMenz rhRvZdcn94f2QcJvvRNIhQ/ZmY5pyQ74f7LGIdLbDpmE7m3liQbVqfjhtFzAUPQUowTJe/TYW KVOYnGSvRPBGQHz3kOzM3B92kKDtrCXvZdhKb0uuzHr6eo1FE+PLjwrW3ptj+//Y8aoe1sEt1 dCgVmR6XazSPFBFk3pmKi0LJCEWj2MgYB+e4niXxsQa4cq5V/5E831WKJFuHspguqLASzfCqx WIb0okLBnIwap85DIFAhzup3lg6LhfxSjyAdzRjpU3gu9muO2NXdNBWo8rvoaO/ydAWwGq9Ey vO8VIqZqvcLTpRnAxwDb5aaqo5Bhe7K3mzWl1+l7gNN6ZeCrGWyfjp6GPsUnNSPWdgQWsKR60 1biLC8CDU0+J1wiazsq0GaNuxrGKcYeSsCBDMXXXVxudTbRUNl399CeCBGdfGz1yJjBM4nI5B 0qtiEgxzM6f8+vpzU7JCt03hy9XiF6ryP6aHK5WpQIvyOERcsSkdKOnF/qLFrjsApbNM= Cc: Jose Abreu , Laurent Pinchart , Arnd Bergmann , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org 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 The of_node member in struct drm_bridge is hidden when CONFIG_OF is disabled, causing a build error: drivers/gpu/drm/bridge/dw-hdmi.c: In function '__dw_hdmi_probe': drivers/gpu/drm/bridge/dw-hdmi.c:2063:14: error: 'struct drm_bridge' has no member named 'of_node' We could fix this either using a Kconfig dependency on CONFIG_OF or making the one line conditional. The latter gives us better compile test coverage, so this is what I'm doing here. Fixes: 69497eb9234e ("drm: bridge: dw-hdmi: Implement DRM bridge registration") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/bridge/dw-hdmi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index 4fda0717e789..9a9ec27d9e28 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -2060,7 +2060,9 @@ __dw_hdmi_probe(struct platform_device *pdev, hdmi->bridge.driver_private = hdmi; hdmi->bridge.funcs = &dw_hdmi_bridge_funcs; +#ifdef CONFIG_OF hdmi->bridge.of_node = pdev->dev.of_node; +#endif ret = dw_hdmi_fb_registered(hdmi); if (ret)