From patchwork Mon Apr 3 18:57:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9660497 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1CC4D60353 for ; Mon, 3 Apr 2017 19:52:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09BBC2849A for ; Mon, 3 Apr 2017 19:52:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0AF5284D8; Mon, 3 Apr 2017 19:52:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 54A762849A for ; Mon, 3 Apr 2017 19:52:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=K5kFE10Ozq96EoU9v1alf+YzTQHN8j/Rn752JmGVzIk=; b=jkkXZMMwTi8QgcJMs9xAiDCcL7 WelONM9I7EksP58E3hl2VP+yAkx005Ean1pOhnjVYXzSa0O3onaGbK86wZCNky5d7v6W0UXB2ILLf qq7SrWZ/Dg2Ns6kb++7ibIQuSaKjCBMxIWV/dBKVKTskG+hKtD2tWPmevftdT+X0srHlLLe9aH4gb rO1DBxk8aIaWycwhDv/XE8eByP9adMRpWksacBZHzbAyYjlI1BnU76L1SwE26HXIctr99BydyvgHc 3Srg5Cwa/uO3aCoPa+KRBEMsy+bCOm75xdzZXLsE9bIS5DBqyOP5gYoEaCXxy7NJgWKDTdVnrVIio uTKMXWyQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cv81t-0003lb-Es; Mon, 03 Apr 2017 19:52:45 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cv7tU-0005WJ-TT for linux-arm-kernel@bombadil.infradead.org; Mon, 03 Apr 2017 19:44:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=BgoUpUFyBpBj/IYb7rLM3C9I8JJLGElKTNFnEhlUnnQ=; b=ki00tpBqfY6/UYBnnQuSnIh+/ awlivI8McfvHYaEIrgUFQpIfQbMY14AkEm0P0I2o4OjIkIjVc4+0pZJqXrh/uSrhAXO+CW0zEfzU1 ykfC50OduQTJpSnePxy/xVnVU26Byi5IPS7+p38CVs4pOZdvvh6CnYhXrFshXvkv/6XV0uTYX8SBt RDv+NByo2DfnSyDzxFYazinPODcMjLvGhCnF3IVxD8qJjM6Rb1F5faFZGufwU/TTpDwROO/yF+IbI cfjSOH/rSLQ8c04cDqPAvX329SiQOoxgi4Ir1Rmuhv8dG4XvXinxKsk9le1TsMoTrugjw2BfdlJQD 1ybI2zD+g==; Received: from mail-qt0-f171.google.com ([209.85.216.171]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cv7Jz-0006nP-Ve for linux-arm-kernel@lists.infradead.org; Mon, 03 Apr 2017 19:07:27 +0000 Received: by mail-qt0-f171.google.com with SMTP id i34so121114281qtc.0 for ; Mon, 03 Apr 2017 12:07:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BgoUpUFyBpBj/IYb7rLM3C9I8JJLGElKTNFnEhlUnnQ=; b=TKH35aufWzaqlO1H/dNEE7Ezol250xdVOCaQ/n3XGPxJFGGq1HEVSKD9IRRfISk8+f TTcOAyzsXwpx+xGb5BPYRX24u//GCoBnMJf4AFZRAxZWSII8JYTjbnX3ohIOSr1xwbT7 7m9GNhVvWVZDnm5Eu37lkEfKblRnG70tVAMrAxzGWcUPSbHOfLdME+vmOvMGIPAHXLMY 0uk1IDN53MSdSD7LLlG0RcJjiw/J7wVQEKGpjtOR862LgykRLNewMz+wsZZL68u+sUZR KjLaLUZNSa3w0DuG95jAZHeJupL9Vp278IhqePa+Qu55YIwGXqbp0Dy5hkrKlBv9WDDa U8Lw== X-Gm-Message-State: AFeK/H1FyeXOBrH97Ei9lQgKx893MQvcD8JBaXvDk6RdsWIbttD2Rn7hmhCUOIaQHt0QZtp6 X-Received: by 10.200.48.54 with SMTP id f51mr18111347qte.164.1491245919464; Mon, 03 Apr 2017 11:58:39 -0700 (PDT) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc:1722:8a6b:a66c:79eb]) by smtp.gmail.com with ESMTPSA id e5sm10173689qtc.6.2017.04.03.11.58.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 11:58:38 -0700 (PDT) From: Laura Abbott To: Sumit Semwal , Riley Andrews , arve@android.com Subject: [PATCHv3 09/22] staging: android: ion: Remove custom ioctl interface Date: Mon, 3 Apr 2017 11:57:51 -0700 Message-Id: <1491245884-15852-10-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491245884-15852-1-git-send-email-labbott@redhat.com> References: <1491245884-15852-1-git-send-email-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170403_150724_099249_11D1CEBF X-CRM114-Status: GOOD ( 16.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, romlem@google.com, Greg Kroah-Hartman , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, Mark Brown , Laurent Pinchart , Benjamin Gaignard , Daniel Vetter , Laura Abbott , Brian Starkey , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Ion is now moving towards a unified interfact. This makes the custom ioctl interface unneeded. Remove it. Signed-off-by: Laura Abbott --- drivers/staging/android/ion/compat_ion.c | 40 -------------------------- drivers/staging/android/ion/ion-ioctl.c | 11 ------- drivers/staging/android/ion/ion.c | 6 +--- drivers/staging/android/ion/ion_dummy_driver.c | 2 +- drivers/staging/android/ion/ion_priv.h | 8 +----- drivers/staging/android/uapi/ion.h | 21 -------------- 6 files changed, 3 insertions(+), 85 deletions(-) diff --git a/drivers/staging/android/ion/compat_ion.c b/drivers/staging/android/ion/compat_ion.c index b892d3a..5b192ea 100644 --- a/drivers/staging/android/ion/compat_ion.c +++ b/drivers/staging/android/ion/compat_ion.c @@ -30,11 +30,6 @@ struct compat_ion_allocation_data { compat_int_t handle; }; -struct compat_ion_custom_data { - compat_uint_t cmd; - compat_ulong_t arg; -}; - struct compat_ion_handle_data { compat_int_t handle; }; @@ -43,8 +38,6 @@ struct compat_ion_handle_data { struct compat_ion_allocation_data) #define COMPAT_ION_IOC_FREE _IOWR(ION_IOC_MAGIC, 1, \ struct compat_ion_handle_data) -#define COMPAT_ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, \ - struct compat_ion_custom_data) static int compat_get_ion_allocation_data( struct compat_ion_allocation_data __user *data32, @@ -105,22 +98,6 @@ static int compat_put_ion_allocation_data( return err; } -static int compat_get_ion_custom_data( - struct compat_ion_custom_data __user *data32, - struct ion_custom_data __user *data) -{ - compat_uint_t cmd; - compat_ulong_t arg; - int err; - - err = get_user(cmd, &data32->cmd); - err |= put_user(cmd, &data->cmd); - err |= get_user(arg, &data32->arg); - err |= put_user(arg, &data->arg); - - return err; -}; - long compat_ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { long ret; @@ -166,23 +143,6 @@ long compat_ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) return filp->f_op->unlocked_ioctl(filp, ION_IOC_FREE, (unsigned long)data); } - case COMPAT_ION_IOC_CUSTOM: { - struct compat_ion_custom_data __user *data32; - struct ion_custom_data __user *data; - int err; - - data32 = compat_ptr(arg); - data = compat_alloc_user_space(sizeof(*data)); - if (!data) - return -EFAULT; - - err = compat_get_ion_custom_data(data32, data); - if (err) - return err; - - return filp->f_op->unlocked_ioctl(filp, ION_IOC_CUSTOM, - (unsigned long)data); - } case ION_IOC_SHARE: case ION_IOC_MAP: case ION_IOC_IMPORT: diff --git a/drivers/staging/android/ion/ion-ioctl.c b/drivers/staging/android/ion/ion-ioctl.c index e096bcd..2b475bf 100644 --- a/drivers/staging/android/ion/ion-ioctl.c +++ b/drivers/staging/android/ion/ion-ioctl.c @@ -26,7 +26,6 @@ union ion_ioctl_arg { struct ion_fd_data fd; struct ion_allocation_data allocation; struct ion_handle_data handle; - struct ion_custom_data custom; struct ion_heap_query query; }; @@ -52,7 +51,6 @@ static unsigned int ion_ioctl_dir(unsigned int cmd) { switch (cmd) { case ION_IOC_FREE: - case ION_IOC_CUSTOM: return _IOC_WRITE; default: return _IOC_DIR(cmd); @@ -62,7 +60,6 @@ static unsigned int ion_ioctl_dir(unsigned int cmd) long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct ion_client *client = filp->private_data; - struct ion_device *dev = client->dev; struct ion_handle *cleanup_handle = NULL; int ret = 0; unsigned int dir; @@ -145,14 +142,6 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) data.handle.handle = handle->id; break; } - case ION_IOC_CUSTOM: - { - if (!dev->custom_ioctl) - return -ENOTTY; - ret = dev->custom_ioctl(client, data.custom.cmd, - data.custom.arg); - break; - } case ION_IOC_HEAP_QUERY: ret = ion_query_heaps(client, &data.query); break; diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 8757164..125c537 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -1347,10 +1347,7 @@ void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap) } EXPORT_SYMBOL(ion_device_add_heap); -struct ion_device *ion_device_create(long (*custom_ioctl) - (struct ion_client *client, - unsigned int cmd, - unsigned long arg)) +struct ion_device *ion_device_create(void) { struct ion_device *idev; int ret; @@ -1387,7 +1384,6 @@ struct ion_device *ion_device_create(long (*custom_ioctl) debugfs_done: - idev->custom_ioctl = custom_ioctl; idev->buffers = RB_ROOT; mutex_init(&idev->buffer_lock); init_rwsem(&idev->lock); diff --git a/drivers/staging/android/ion/ion_dummy_driver.c b/drivers/staging/android/ion/ion_dummy_driver.c index c1f9b83..033bb86 100644 --- a/drivers/staging/android/ion/ion_dummy_driver.c +++ b/drivers/staging/android/ion/ion_dummy_driver.c @@ -67,7 +67,7 @@ static int __init ion_dummy_init(void) { int i, err; - idev = ion_device_create(NULL); + idev = ion_device_create(); if (IS_ERR(idev)) return PTR_ERR(idev); heaps = kcalloc(dummy_ion_pdata.nr, sizeof(struct ion_heap *), diff --git a/drivers/staging/android/ion/ion_priv.h b/drivers/staging/android/ion/ion_priv.h index 4fc7026..a86866a 100644 --- a/drivers/staging/android/ion/ion_priv.h +++ b/drivers/staging/android/ion/ion_priv.h @@ -95,8 +95,6 @@ struct ion_device { struct mutex buffer_lock; struct rw_semaphore lock; struct plist_head heaps; - long (*custom_ioctl)(struct ion_client *client, unsigned int cmd, - unsigned long arg); struct rb_root clients; struct dentry *debug_root; struct dentry *heaps_debug_root; @@ -260,14 +258,10 @@ bool ion_buffer_fault_user_mappings(struct ion_buffer *buffer); /** * ion_device_create - allocates and returns an ion device - * @custom_ioctl: arch specific ioctl function if applicable * * returns a valid device or -PTR_ERR */ -struct ion_device *ion_device_create(long (*custom_ioctl) - (struct ion_client *client, - unsigned int cmd, - unsigned long arg)); +struct ion_device *ion_device_create(void); /** * ion_device_destroy - free and device and it's resource diff --git a/drivers/staging/android/uapi/ion.h b/drivers/staging/android/uapi/ion.h index c3a87a5..8ff471d 100644 --- a/drivers/staging/android/uapi/ion.h +++ b/drivers/staging/android/uapi/ion.h @@ -115,19 +115,6 @@ struct ion_handle_data { ion_user_handle_t handle; }; -/** - * struct ion_custom_data - metadata passed to/from userspace for a custom ioctl - * @cmd: the custom ioctl function to call - * @arg: additional data to pass to the custom ioctl, typically a user - * pointer to a predefined structure - * - * This works just like the regular cmd and arg fields of an ioctl. - */ -struct ion_custom_data { - unsigned int cmd; - unsigned long arg; -}; - #define MAX_HEAP_NAME 32 /** @@ -207,14 +194,6 @@ struct ion_heap_query { #define ION_IOC_IMPORT _IOWR(ION_IOC_MAGIC, 5, struct ion_fd_data) /** - * DOC: ION_IOC_CUSTOM - call architecture specific ion ioctl - * - * Takes the argument of the architecture specific ioctl to call and - * passes appropriate userdata for that ioctl - */ -#define ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, struct ion_custom_data) - -/** * DOC: ION_IOC_HEAP_QUERY - information about available heaps * * Takes an ion_heap_query structure and populates information about