From patchwork Sat Mar 18 00:54:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9631947 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 BA47A60132 for ; Sat, 18 Mar 2017 01:57:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FE38284B4 for ; Sat, 18 Mar 2017 01:57:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9256A284EE; Sat, 18 Mar 2017 01:57:45 +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=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23BD7284B4 for ; Sat, 18 Mar 2017 01:57:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751096AbdCRB5n (ORCPT ); Fri, 17 Mar 2017 21:57:43 -0400 Received: from mail-qk0-f176.google.com ([209.85.220.176]:34927 "EHLO mail-qk0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751037AbdCRB5m (ORCPT ); Fri, 17 Mar 2017 21:57:42 -0400 Received: by mail-qk0-f176.google.com with SMTP id v127so77858918qkb.2 for ; Fri, 17 Mar 2017 18:57:41 -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=A3WZ1yx2y5Z9joq+y/Seud+jFrWU70kawufnkTSEueM=; b=GdKQxwaFFdjpEcLMqfVpoJGpUw00Yy5+0yqwkUgd7sITGWAlKbUJRsBOK7jtyDNVvU nIoUFZN7Q57Aqe5o4OWGL3qS95qPNr3xxurn7qP0Sn//FKPtTNMw7uD3e0TnZi+ObCFL w3P/kKmEWvMdqkjoqejxJdGjr4HwFKlNZkZjfUPotORtgDmVFV4MLaGfk+kn0QZpmWuV vvChjmRrnahMqYnhS9DxvAQ5ShCArF2eiXvavAXaYHaqBlYzzcH3hxiYisf2En5pZHoc rt0LZWfVZFhD1K+6ab27FYszwevpcz6Ss5bqp6TIR25nW0jniJoiAj/DPqoaTB7wiA5V ly1Q== X-Gm-Message-State: AFeK/H04VO0v2JrdbAUz4vnM7yMQ9VimNrGd22XEXdh8BtVOvXSnkXvtJyGOE14i8o8DSZOj X-Received: by 10.55.22.66 with SMTP id g63mr15462821qkh.18.1489798536270; Fri, 17 Mar 2017 17:55:36 -0700 (PDT) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc:1722:8a6b:a66c:79eb]) by smtp.gmail.com with ESMTPSA id e55sm7118568qte.52.2017.03.17.17.55.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2017 17:55:35 -0700 (PDT) From: Laura Abbott To: Sumit Semwal , Riley Andrews , arve@android.com Cc: Laura Abbott , romlem@google.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, Brian Starkey , Daniel Vetter , Mark Brown , Benjamin Gaignard , linux-mm@kvack.org, Laurent Pinchart Subject: [RFC PATCHv2 11/21] staging: android: ion: Remove duplicate ION_IOC_MAP Date: Fri, 17 Mar 2017 17:54:43 -0700 Message-Id: <1489798493-16600-12-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489798493-16600-1-git-send-email-labbott@redhat.com> References: <1489798493-16600-1-git-send-email-labbott@redhat.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.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