From patchwork Wed Jan 13 13:48:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8025681 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D9F88BEEE5 for ; Wed, 13 Jan 2016 13:48:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17BFF20513 for ; Wed, 13 Jan 2016 13:48:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 319B0204AD for ; Wed, 13 Jan 2016 13:48:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 573246E503; Wed, 13 Jan 2016 05:48:25 -0800 (PST) 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.126.133]) by gabe.freedesktop.org (Postfix) with ESMTPS id B26856E503 for ; Wed, 13 Jan 2016 05:48:23 -0800 (PST) Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue003) with ESMTPSA (Nemesis) id 0MKdqV-1aHyL90KqV-001zv8; Wed, 13 Jan 2016 14:48:16 +0100 From: Arnd Bergmann To: airlied@linux.ie, dri-devel@lists.freedesktop.org Subject: [PATCH] drm: nouveau: fix nouveau_debugfs_init prototype Date: Wed, 13 Jan 2016 14:48:13 +0100 Message-ID: <3968390.Pvmnq3v7oC@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:b1jV8cuj5QNUw/ueRzRyorJn5viwwh5Mm63XAZ4fCBgRfu81ztn gPLltkDbGP6Jzi+1eowvXcV1lBtoQqbxOZWNHpk3IjtRdhor8T4NgSqWCoBVUcIIAshGi4C Y6Rf1Ab0BEqlWEOc+kF3BUToOM/atDHBzR1sO16jrRVnnEeW5r2/2xcK/A6ShKLVPeGPzVQ va7RZfVOn+ZK59s/ZNgJQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:7ebMyW344DI=:pT6lgUC4cxoTSdgK4Zc5Fa 93G2MTq1PrDiXa4QcYbnKpi+OkNd9GcUw0kRODC/gXxDhYWG5c+vuvglOUMrXVW8YJtD1d6Ll /fmRLyRBR5lTXuHGTjmSrLBQSr129pl7wt1gzD2sDpwkrtb9b45TFwSBkYzy5y31R26P1AlFi NwvEbVwdDSNrvajSmcfX0ZSTqx6F2u4iEJb07yVjy0XL+mvrtrc7VL73X4OxJ8r/LK7HKm7V3 HkJejc+b4G2RqeoIhGccMulo2l8aln5HivIwPHzkIlWcwos4usGBom7UgSVAG231RD75i7dh5 hZ00om6+tmDdCJILd9gJkoSTZOrPhd7HpXUDNB1gcdpeuzKwNIbsrQezfxkPTxtxnjUfEaMKd cs8Ey1Nu9EbgLdxhdoaY/N/tDomJcWQ0e1hScb9TjXMVeF+HLaMmNpu/sWifZmPuCzTZQR6PA /+d+o2HReaJB63OcK393eCqzhBQS8ICSFiodz1rupagkCmg/K97JVobY7hx82wOTSWlXCj4VB 5CFUN7rlofgGexwKohFeQOBNVfIaRAydf9Jl2s3QCyHwUxR7aN6+qNzyuVRLz+/pNgTTHICb/ N56wmLcUapPy0fe1px2fxZZ1e2SYLvBINmiiFCWW1L2k854965upZfhLtjWm92/HQZv4tECnA KJVMe1QAgaq34i80moKKo8zw5dK8xyPZYjwPXVb2S7mwPq1KWsp/S4xSyP1wk8otLisfBHEl4 OCYEUpOrolkvhdYj Cc: linux-kernel@vger.kernel.org, bskeggs@redhat.com, linux-arm-kernel@lists.infradead.org, Karol Herbst 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The new debugfs initialization code fails to build when CONFIG_DEBUG_FS is disabled: In file included from /git/arm-soc/drivers/gpu/drm/nouveau/nouveau_drm.c:57:0: drivers/gpu/drm/nouveau/nouveau_debugfs.h: In function 'nouveau_debugfs_init': drivers/gpu/drm/nouveau/nouveau_debugfs.h:37:29: error: parameter name omitted nouveau_debugfs_init(struct nouveau_drm *) This fixes the prototypes so we can build it again. Signed-off-by: Arnd Bergmann Fixes: b126a200e9db ("drm/nouveau/debugfs: we need a ctrl object for debugfs") --- This broke when the nouveau patches got merged into drm-next on Monday. Found on ARM randconfig builds. diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.h b/drivers/gpu/drm/nouveau/nouveau_debugfs.h index 52c7161297d7..b8c03ff5bf05 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.h +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.h @@ -34,13 +34,13 @@ nouveau_drm_debugfs_cleanup(struct drm_minor *minor) } static inline int -nouveau_debugfs_init(struct nouveau_drm *) +nouveau_debugfs_init(struct nouveau_drm *drm) { return 0; } static inline void -nouveau_debugfs_fini(struct nouveau_drm *) +nouveau_debugfs_fini(struct nouveau_drm *drm) { }