From patchwork Tue Sep 23 13:46:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 4956591 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CC50F9F32F for ; Tue, 23 Sep 2014 13:47:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C03B20265 for ; Tue, 23 Sep 2014 13:47:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DA2BD2025B for ; Tue, 23 Sep 2014 13:47:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DF156E575; Tue, 23 Sep 2014 06:47:16 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 370CA6E573 for ; Tue, 23 Sep 2014 06:47:12 -0700 (PDT) Received: by mail-wi0-f172.google.com with SMTP id em10so4885655wid.17 for ; Tue, 23 Sep 2014 06:47:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1Fh2wwabwauFpQdvn3Cs6m9JdKpae13WsYjr/afSgvs=; b=FotIh3FlwFUYThgadfxAN2Rz+1xDhbNjL87TRIj2gI+JHp13IwMLyRC/of4/rCTuEm mX5fHa973ueRXoynaPF+wFraBR/+9GqKv064mADEQ1C8G3UdlgVRin9uEvs53gKW7k2b +xeI98x8qQY7zg+oQW8qWsKfWRpX8K2I6qh94= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1Fh2wwabwauFpQdvn3Cs6m9JdKpae13WsYjr/afSgvs=; b=XoWXkj3O/CyKubKNsbvyu+CVpuIcEyBG2wuRmyaHu83FWFZRqf6xuiDJ0g2Hrrrjwo d8Mg47dlJEtj4vS0z1gzG6nO0hpz26m5hMkBy2fbvYGjiaOt/4wKQsWqMMo4QY135kRR il6/hHGOFfuvWjgSOIyHjLjPhdtHM5hsZUr8uuSIxmnUxPbfcOETQh3qTahxE7dcFxTJ V30MgwtsACcLe5V5g7nh0nJT4zl5yoGlab9/2itX4LPZWyEm1GAPUckTbHvHsRuExJkX QvWVAekZbXuZrLNHsAC9LM+/KClj8MVgBnYM9As4sB0EDI5scQ9MxUh5n/kJFN3Z/3Wu Rchg== X-Gm-Message-State: ALoCoQncQ+9UyHpyDjXXH0MtHybYWu/vJ0VFmcKAopdXOaAb4GHVQwH7+XJ44hXywJ6JW4sSauW1 X-Received: by 10.180.91.133 with SMTP id ce5mr22694595wib.62.1411480031224; Tue, 23 Sep 2014 06:47:11 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id wx3sm15982504wjc.19.2014.09.23.06.47.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Sep 2014 06:47:10 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 6/8] drm: Move internal debugfs functions to drm_internal.h Date: Tue, 23 Sep 2014 15:46:52 +0200 Message-Id: <1411480014-10138-7-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1411480014-10138-1-git-send-email-daniel.vetter@ffwll.ch> References: <1411480014-10138-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 In my header cleanup I've missed the debugfs functions completely. Signed-off-by: Daniel Vetter Reviewed-by: David Herrmann --- drivers/gpu/drm/drm_internal.h | 28 ++++++++++++++++++++++++++++ include/drm/drmP.h | 25 ------------------------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index bc71be6f29e0..7cc0a3516871 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -102,3 +102,31 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, int drm_dropmaster_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); struct drm_master *drm_master_create(struct drm_minor *minor); + +/* drm_debugfs.c */ +#if defined(CONFIG_DEBUG_FS) +int drm_debugfs_init(struct drm_minor *minor, int minor_id, + struct dentry *root); +int drm_debugfs_cleanup(struct drm_minor *minor); +int drm_debugfs_connector_add(struct drm_connector *connector); +void drm_debugfs_connector_remove(struct drm_connector *connector); +#else +static inline int drm_debugfs_init(struct drm_minor *minor, int minor_id, + struct dentry *root) +{ + return 0; +} + +static inline int drm_debugfs_cleanup(struct drm_minor *minor) +{ + return 0; +} + +static inline int drm_debugfs_connector_add(struct drm_connector *connector) +{ + return 0; +} +static inline void drm_debugfs_connector_remove(struct drm_connector *connector) +{ +} +#endif diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 09dd6c77f152..9130c8bd9e09 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1037,23 +1037,12 @@ extern unsigned int drm_debug; /* Debugfs support */ #if defined(CONFIG_DEBUG_FS) -extern int drm_debugfs_init(struct drm_minor *minor, int minor_id, - struct dentry *root); extern int drm_debugfs_create_files(const struct drm_info_list *files, int count, struct dentry *root, struct drm_minor *minor); extern int drm_debugfs_remove_files(const struct drm_info_list *files, int count, struct drm_minor *minor); -extern int drm_debugfs_cleanup(struct drm_minor *minor); -extern int drm_debugfs_connector_add(struct drm_connector *connector); -extern void drm_debugfs_connector_remove(struct drm_connector *connector); #else -static inline int drm_debugfs_init(struct drm_minor *minor, int minor_id, - struct dentry *root) -{ - return 0; -} - static inline int drm_debugfs_create_files(const struct drm_info_list *files, int count, struct dentry *root, struct drm_minor *minor) @@ -1066,20 +1055,6 @@ static inline int drm_debugfs_remove_files(const struct drm_info_list *files, { return 0; } - -static inline int drm_debugfs_cleanup(struct drm_minor *minor) -{ - return 0; -} - -static inline int drm_debugfs_connector_add(struct drm_connector *connector) -{ - return 0; -} -static inline void drm_debugfs_connector_remove(struct drm_connector *connector) -{ -} - #endif extern struct dma_buf *drm_gem_prime_export(struct drm_device *dev,