From patchwork Sun Jul 7 19:02:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 2824628 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 05CBC9F9CA for ; Sun, 7 Jul 2013 19:14:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 23CD520121 for ; Sun, 7 Jul 2013 19:14:03 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 50061200CF for ; Sun, 7 Jul 2013 19:14:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B588E5EE4 for ; Sun, 7 Jul 2013 12:14:02 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fireflyinternet.com (unknown [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B896E60C9 for ; Sun, 7 Jul 2013 12:02:36 -0700 (PDT) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=87.106.93.118; Received: from fireflyinternet.com (unverified [87.106.93.118]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 129474447-1500050 for ; Sun, 07 Jul 2013 20:02:35 +0100 X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.73.22; Received: from arrandale.alporthouse.com (unverified [78.156.73.22]) by fireflyinternet.com (Firefly Internet (M2)) with ESMTP id 9693303-1500048 for multiple; Sun, 07 Jul 2013 20:02:35 +0100 From: Chris Wilson To: dri-devel@lists.freedesktop.org Subject: [PATCH 8/8] drm: Remove debugfs_cleanup callback from drivers Date: Sun, 7 Jul 2013 20:02:25 +0100 Message-Id: <1373223745-9095-8-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1373223745-9095-1-git-send-email-chris@chris-wilson.co.uk> References: <1373223745-9095-1-git-send-email-chris@chris-wilson.co.uk> X-Originating-IP: 78.156.73.22 Cc: Dave Airlie X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 No driver did anything other than remove its lists of debugfs inodes which is now handled by the core. So having removed all the driver callbacks, we can now remove the hook from the core. Signed-off-by: Chris Wilson Cc: Dave Airlie Acked-by: Daniel Vetter --- drivers/gpu/drm/drm_debugfs.c | 5 ----- include/drm/drmP.h | 1 - 2 files changed, 6 deletions(-) diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index b855fd7..c09406e 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c @@ -221,14 +221,9 @@ EXPORT_SYMBOL(drm_debugfs_remove_files); */ int drm_debugfs_cleanup(struct drm_minor *minor) { - struct drm_device *dev = minor->dev; - if (!minor->debugfs_root) return 0; - if (dev->driver->debugfs_cleanup) - dev->driver->debugfs_cleanup(minor); - while (!list_empty(&minor->debugfs_list)) { struct drm_info_node *node = list_first_entry(&minor->debugfs_list, diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 82670ac..a493f77 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -902,7 +902,6 @@ struct drm_driver { bool from_release); int (*debugfs_init)(struct drm_minor *minor); - void (*debugfs_cleanup)(struct drm_minor *minor); /** * Driver-specific constructor for drm_gem_objects, to set up