From patchwork Mon Mar 20 09:39:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9633589 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 AB6CF6020B for ; Mon, 20 Mar 2017 09:47:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A47A9267EC for ; Mon, 20 Mar 2017 09:47:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 996CF27F17; Mon, 20 Mar 2017 09:47: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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 D129C267EC for ; Mon, 20 Mar 2017 09:47:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 22BE46E0A0; Mon, 20 Mar 2017 09:47:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 863426E0A0; Mon, 20 Mar 2017 09:47:17 +0000 (UTC) Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0MHrNV-1cmKsk0AvN-003fAq; Mon, 20 Mar 2017 10:39:43 +0100 From: Arnd Bergmann To: Rob Clark , David Airlie Subject: [PATCH] drm/msm: add stubs for msm_{perf,rd}_debugfs_cleanup Date: Mon, 20 Mar 2017 10:39:25 +0100 Message-Id: <20170320093936.1255573-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:98pbNyJCjULLkErmDBEoyEb4Ba/L8Fm/uMbYwgIrm/aTbJ/oEO/ LH6D/bZWK3pkZhZrRguCwh40a0GfPblZs5bRvjnMYtF0YhVlttIHWrcAazkpqI7Il+nCEYP eL5wRDE5Ceh3QmWgRB99twGMx1dcnMhB6h8POxJqCL8OwY0bgwVGVY6P+8C+jZ9zGH11oE0 /Z7IobBgcCjzFrhXJvbsQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:P4T+KY9slZI=:uhx+keirDIXPpFVs1qVNOc qCi/KrzyKEOUuHO9MZqUrneDuBLiHfDaqdXRnwnAt8VOKKPxfGgQmzppyA5L4DStryE0THomP UdezRW3oFAkNZxmRfDh/PN0hi21cLlr45oLwWlgtZV8Fof1QUI0CTdIAOTpKclmFF/oST6hD2 Xx00wg9s94T/ZsTKwvKRPX2ZdKIG4yGDw4zDNDRhcqTHR5jJgbsTVexzYyOJ6U8N8rb5jGvPm e6Px25YisK5EDSnqZcda7L/346cyHy+DIDmDFTYtey/9UeENBDdLh9O1M7RTp66JNyz6LA3Lt aEb+Cwu8b27mdLL4Hgiehkn8KaTGt38bD4el7YbLemVZHuVCVl+EVuPzYdKUnG5amXGo7DnX/ y7bKZHiFNM15EAVm+JfnAa9s8hBEQG/P9iDrPx3h5JStXBKJuJcSCYujJ9mI2wSQsbtVVGzWu 6CcO4z0JNCCbJps4l+LWe+JS1RlwCF3IUZSLUP2b7vXl090GTn914Gcc3ERfwKRQNDHNdvy0q Jfe9El/TGPju/+gseXUk3CiEvLgdrH+ZZKTEDaJzJPgJL98wc5Rnw0HRk6414zoHi85p6/XW6 4xx7XmdHUQDCRWEffmkCtnDAwe6gpDH8GzOdDYbD5EuVBbxn1gQZkuxyzNRv3n4YwfRK3uhwQ SBpF3fJqK8Y8FCLr/4wjf1YSFr5A8AVqb3l8+5X/geQvSqP3t67G95h8RcEiw8wXltvE= Cc: Arnd Bergmann , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@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 We now call those two functions even when they are not defined or declared anywhere because DEBUG_FS is disabled: drivers/gpu/drm/msm/msm_drv.c: In function 'msm_drm_uninit': drivers/gpu/drm/msm/msm_drv.c:244:2: error: implicit declaration of function 'msm_perf_debugfs_cleanup';did you mean 'msm_framebuffer_cleanup'? [-Werror=implicit-function-declaration] drivers/gpu/drm/msm/msm_drv.c:245:2: error: implicit declaration of function 'msm_rd_debugfs_cleanup';did you mean 'msm_framebuffer_cleanup'? [-Werror=implicit-function-declaration] This adds empty stub implementations for that case. Fixes: 85eac4700ede ("drm/msm: Remove msm_debugfs_cleanup()") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/msm_drv.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index b51fb0d70f43..b885c3d5ae4d 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -311,6 +311,8 @@ void msm_perf_debugfs_cleanup(struct msm_drm_private *priv); #else static inline int msm_debugfs_late_init(struct drm_device *dev) { return 0; } static inline void msm_rd_dump_submit(struct msm_gem_submit *submit) {} +static inline void msm_rd_debugfs_cleanup(struct msm_drm_private *priv) {} +static inline void msm_perf_debugfs_cleanup(struct msm_drm_private *priv) {} #endif struct clk *msm_clk_get(struct platform_device *pdev, const char *name);