From patchwork Wed Jul 10 12:11:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2825667 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 11FA09F7D6 for ; Wed, 10 Jul 2013 12:18:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B45E9201B5 for ; Wed, 10 Jul 2013 12:18:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 714DF20196 for ; Wed, 10 Jul 2013 12:18:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 42BDAE62CA for ; Wed, 10 Jul 2013 05:18:24 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f48.google.com (mail-ee0-f48.google.com [74.125.83.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 88A89E5F41 for ; Wed, 10 Jul 2013 05:12:28 -0700 (PDT) Received: by mail-ee0-f48.google.com with SMTP id b47so4724835eek.7 for ; Wed, 10 Jul 2013 05:12:27 -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=B7RmNsaAde5nqCenNIioXED6UrmkolGozlutpwIPSkc=; b=ib2bSf4G7Xo/QpTPQ9Hy65NsH+W+eg5Q9ozzMUoczdxVAgvk1zN18ABZKccbXIIn7B hJbvCD+jBbTEowIdLerPcbqokQq+B0nNu29P8cvXjx7nFUCX2KUUhDNrok3DL5n8T4VE tyd+8YgavuZ8jk5Qo2r0zR9rkyzFLD91dhVVI= 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=B7RmNsaAde5nqCenNIioXED6UrmkolGozlutpwIPSkc=; b=MAwikQ47uWZ4tnu8NRsL3E/2ZCrDjLjzFgVwS41LoI3U8lLb72QOWazofnwspTnv/7 3/tUyYXRRqwVHpj1jplc5ll5l/VJIXy8SNM1B5cvFUpgLGQ6JAzZ0vRp8I7Z4FJRiz08 IkcPOhTZ35Ax7Q30jdEEn1HOekhHeO3PiGllaPQXC257EBAsipdzusz2WeFKB/emGIiV 9vqoBdCRqETU6vPITQFD7n3E64y6IuDckf3+j+2Hpjzw5wDdtk3b2Fw9z6NBmM4uF6BV MSQFJ1q/kWS9RXVlF7bxe2UrVoAvv5Jq3FrSNCH+1zyN5SJ3MTDoxx/4gOpKYOJPr0Ba Ei0Q== X-Received: by 10.14.203.194 with SMTP id f42mr36197322eeo.53.1373458347460; Wed, 10 Jul 2013 05:12:27 -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.26 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Jul 2013 05:12:26 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/39] drm/radoen: kill radeon_dma_ioctl_kms Date: Wed, 10 Jul 2013 14:11:40 +0200 Message-Id: <1373458333-5988-7-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: ALoCoQlF3zNkBdDouQ6crsYLb7T5kib0b5+6ZHrqYt4dOCL9etFm0Oc5kM88Aflg9L91iG2cumNf 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 No need to create a dummy ioctl function to return -EINVAL, since that's what the core already does in the absence of the dma_ioctl callback. So we can safely remove this. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/radeon/radeon_drv.c | 3 --- drivers/gpu/drm/radeon/radeon_kms.c | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index e5419b3..c07b681 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -101,8 +101,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev); int radeon_driver_irq_postinstall_kms(struct drm_device *dev); void radeon_driver_irq_uninstall_kms(struct drm_device *dev); irqreturn_t radeon_driver_irq_handler_kms(DRM_IRQ_ARGS); -int radeon_dma_ioctl_kms(struct drm_device *dev, void *data, - struct drm_file *file_priv); int radeon_gem_object_init(struct drm_gem_object *obj); void radeon_gem_object_free(struct drm_gem_object *obj); int radeon_gem_object_open(struct drm_gem_object *obj, @@ -417,7 +415,6 @@ static struct drm_driver kms_driver = { .gem_free_object = radeon_gem_object_free, .gem_open_object = radeon_gem_object_open, .gem_close_object = radeon_gem_object_close, - .dma_ioctl = radeon_dma_ioctl_kms, .dumb_create = radeon_mode_dumb_create, .dumb_map_offset = radeon_mode_dumb_mmap, .dumb_destroy = radeon_mode_dumb_destroy, diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 49ff3d1..07b0236 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -683,16 +683,6 @@ int radeon_get_vblank_timestamp_kms(struct drm_device *dev, int crtc, drmcrtc); } -/* - * IOCTL. - */ -int radeon_dma_ioctl_kms(struct drm_device *dev, void *data, - struct drm_file *file_priv) -{ - /* Not valid in KMS. */ - return -EINVAL; -} - #define KMS_INVALID_IOCTL(name) \ int name(struct drm_device *dev, void *data, struct drm_file *file_priv)\ { \