From patchwork Mon Apr 3 18:57:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9660453 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 58E766032D for ; Mon, 3 Apr 2017 19:37:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46FED284D6 for ; Mon, 3 Apr 2017 19:37:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3787F284D9; Mon, 3 Apr 2017 19:37: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 C4799284D6 for ; Mon, 3 Apr 2017 19:37:47 +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=/pWGodGEYQxnfqw6MgveZVbYSQ36nCHhQHZzNWOUUn8=; b=qKFowj2PppGyIX+90hhpgiLDAv BwB3kRyg4RsG7GMcvzbvo/bXLggvuqNszXeQ5hlOfjPHUvHeW0ulU3ELjU6ms5uGoEi7PS63G6gls ViO8HPK0+rM94o2q0rqKzHiAxX+zZX01MscxJ2uo/MA2hVQjVvDuckN0XhiEBy8tfdYw2nJuOICC0 7tnwfoUuvvKAWvt0dDF4OIa/iBw7Lnmf/+0s8EVXJXUTjbv2EndPevE882LlZPSpvrqARkxbRgFKG taEk1Qo+qa6W2EPU4uPEYoM8FaTRmzhxySSBbqXFwxzYZxFk0/gfMxGQXMcH1LC/M3aJTpzxkIpV4 AC1hdakQ==; 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 1cv7nN-0003V5-4D; Mon, 03 Apr 2017 19:37:45 +0000 Received: from mail-qt0-f169.google.com ([209.85.216.169]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cv7Hp-0001xI-F4 for linux-arm-kernel@lists.infradead.org; Mon, 03 Apr 2017 19:05:11 +0000 Received: by mail-qt0-f169.google.com with SMTP id x35so120618492qtc.2 for ; Mon, 03 Apr 2017 12:04:49 -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=CVKrRBK82Tb7bkaaVaWDMINECfG5HSnQyQRBTvhxaVc=; b=nSYLUVmvbu2PjhNkwe73R2ywiuMfDrg7EhTxDq7RT7tOgmJYvZZ9oeIrTLKn5eQgId aMfPf/2W0az0UPzLmmu/+iWy7Awsw/YqnaurRaCaOpbrOxI4g2ujBxTJ6f7suGj8jagh mQTt22mYKhO9cT65kIubcf1O5z13nLc09444zSdnxWb/C3amcQ438jghNQ5eFkGecCV6 w6renC96kAq43M9YqoLd14guF+R7qWH6a8V+doJ3G4zjqnu3wfb8aLvenm3C/LvpzPFJ XHAsE2jqZrTIWGhU7+igfczBN1HMZkV9Nlc7h1VmwvyLnA4g7xRDuJCekXJDWgaKNVEf IC5w== X-Gm-Message-State: AFeK/H2sCiBCJNo0KnAxqx1BnM5XNBF0YexyFssHk7Y2NV9bOm1mvV7cMRkVh/GKEWVPqkEX X-Received: by 10.237.59.19 with SMTP id p19mr18371784qte.28.1491245926158; Mon, 03 Apr 2017 11:58:46 -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.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 11:58:44 -0700 (PDT) From: Laura Abbott To: Sumit Semwal , Riley Andrews , arve@android.com Subject: [PATCHv3 11/22] staging: android: ion: Remove duplicate ION_IOC_MAP Date: Mon, 3 Apr 2017 11:57:53 -0700 Message-Id: <1491245884-15852-12-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_120509_604898_8153785C X-CRM114-Status: GOOD ( 12.24 ) 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_IOC_MAP is the same as ION_IOC_SHARE. We really don't need two identical interfaces. Remove it. Signed-off-by: Laura Abbott --- drivers/staging/android/ion/compat_ion.c | 1 - drivers/staging/android/ion/ion-ioctl.c | 1 - drivers/staging/android/uapi/ion.h | 10 ---------- 3 files changed, 12 deletions(-) diff --git a/drivers/staging/android/ion/compat_ion.c b/drivers/staging/android/ion/compat_ion.c index ae1ffc3..5037ddd 100644 --- a/drivers/staging/android/ion/compat_ion.c +++ b/drivers/staging/android/ion/compat_ion.c @@ -144,7 +144,6 @@ long compat_ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) (unsigned long)data); } case ION_IOC_SHARE: - case ION_IOC_MAP: return filp->f_op->unlocked_ioctl(filp, cmd, (unsigned long)compat_ptr(arg)); default: diff --git a/drivers/staging/android/ion/ion-ioctl.c b/drivers/staging/android/ion/ion-ioctl.c index 7b54eea..a361724 100644 --- a/drivers/staging/android/ion/ion-ioctl.c +++ b/drivers/staging/android/ion/ion-ioctl.c @@ -118,7 +118,6 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) break; } case ION_IOC_SHARE: - case ION_IOC_MAP: { struct ion_handle *handle; diff --git a/drivers/staging/android/uapi/ion.h b/drivers/staging/android/uapi/ion.h index 3a59044..abd72fd 100644 --- a/drivers/staging/android/uapi/ion.h +++ b/drivers/staging/android/uapi/ion.h @@ -164,16 +164,6 @@ struct ion_heap_query { #define ION_IOC_FREE _IOWR(ION_IOC_MAGIC, 1, struct ion_handle_data) /** - * DOC: ION_IOC_MAP - get a file descriptor to mmap - * - * Takes an ion_fd_data struct with the handle field populated with a valid - * opaque handle. Returns the struct with the fd field set to a file - * descriptor open in the current address space. This file descriptor - * can then be used as an argument to mmap. - */ -#define ION_IOC_MAP _IOWR(ION_IOC_MAGIC, 2, struct ion_fd_data) - -/** * DOC: ION_IOC_SHARE - creates a file descriptor to use to share an allocation * * Takes an ion_fd_data struct with the handle field populated with a valid