From patchwork Wed Jul 10 12:11:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2825659 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5177AC0AB2 for ; Wed, 10 Jul 2013 12:14:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 856BE2017B for ; Wed, 10 Jul 2013 12:14:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 05F8520173 for ; Wed, 10 Jul 2013 12:14:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 04106E5FFF for ; Wed, 10 Jul 2013 05:14:19 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com [74.125.83.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C061E5CD5 for ; Wed, 10 Jul 2013 05:12:20 -0700 (PDT) Received: by mail-ee0-f41.google.com with SMTP id d17so4738941eek.14 for ; Wed, 10 Jul 2013 05:12:20 -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:x-mailer:in-reply-to:references; bh=k7L6MWkCRPTBXhMY+lEnmuDeSpAlc92evj9simI5GC8=; b=cXxzT8lBWr/SsFAeA0g69JxHxqoJtSXXx4SXc1BlnV1PFWMgekJ26MjnDeCWAmz/1d 6fs/dDp4d1WkPFd3QGHW7M5AneORgBbdEfmWyk/3MmP3CnQ86pmGZZ3TQ2LAQrYlhcG9 rm5R1NxrdEE0EkB5jNp6KCHmLzx18UffQk8s0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=k7L6MWkCRPTBXhMY+lEnmuDeSpAlc92evj9simI5GC8=; b=TERyQt2DKJ4H2lpSVTOLEruU0DGzeBbJPeu1ZNEHAPaYm2ug4V9yyXhaRGhoQ9TWoA 01Z1YewIR6cJyqguUZSBrJ4oIWyAfzgZBAoh9ls6rjFF7XPAu4QoO7utbDv6dp7OE3o9 4K8z+s2Topjx8grwhAY7PGWgYviNdvCSu/rPdJyCN5tmEDvZUu0C879xZ8HRQJRR6GKx 9SEJX6HuckHMoLDVguC05vSgcUhuF04sVXr8f7L9y/Vpm8P64fXVoMGxCPDijYfNjZ8Q Kbar9LC2kp/cjSDpM6IPr2SZna7L0N2PvBKmeQVcPcbf1Zv0mnbwI7Rwc3lSdIc9REPc 84Ew== X-Received: by 10.14.203.8 with SMTP id e8mr35388916eeo.96.1373458340136; Wed, 10 Jul 2013 05:12:20 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id i2sm59527012eeu.4.2013.07.10.05.12.18 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Jul 2013 05:12:19 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 01/39] drm: remove drm_modctx ioctl and use drm_noop instead Date: Wed, 10 Jul 2013 14:11:35 +0200 Message-Id: <1373458333-5988-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1373458333-5988-1-git-send-email-daniel.vetter@ffwll.ch> References: <1373458333-5988-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQldtQnZmagXIqtk3sYA+FDWExmcWxwEqgvcDXcyiv28g19BHFARV+e03XfDGVs82ZJe97wN Cc: Daniel Vetter 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.4 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 It doesn't do anything, so kill the code. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_context.c | 6 ------ drivers/gpu/drm/drm_drv.c | 2 +- include/drm/drmP.h | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c index 725968d..6f9731f 100644 --- a/drivers/gpu/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c @@ -342,12 +342,6 @@ int drm_addctx(struct drm_device *dev, void *data, return 0; } -int drm_modctx(struct drm_device *dev, void *data, struct drm_file *file_priv) -{ - /* This does nothing */ - return 0; -} - /** * Get context. * diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 99fcd7c..d668011 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -87,7 +87,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = { DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_addctx, DRM_AUTH|DRM_ROOT_ONLY), DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_rmctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), - DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_modctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), + DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF(DRM_IOCTL_GET_CTX, drm_getctx, DRM_AUTH), DRM_IOCTL_DEF(DRM_IOCTL_SWITCH_CTX, drm_switchctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF(DRM_IOCTL_NEW_CTX, drm_newctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 12083dc..523e5f2 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1335,8 +1335,6 @@ extern int drm_resctx(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int drm_addctx(struct drm_device *dev, void *data, struct drm_file *file_priv); -extern int drm_modctx(struct drm_device *dev, void *data, - struct drm_file *file_priv); extern int drm_getctx(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int drm_switchctx(struct drm_device *dev, void *data,