From patchwork Mon Apr 3 18:57:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9660509 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 B234B6016C for ; Mon, 3 Apr 2017 20:07:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9EB6A2815E for ; Mon, 3 Apr 2017 20:07:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92985284FA; Mon, 3 Apr 2017 20:07:37 +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 3FFB82815E for ; Mon, 3 Apr 2017 20:07:37 +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=H8sG+s5wmxuk2Cvusb+Dkm7kMPE6DwNYfZsm6TmUJ0Y=; b=GkVPQo6HMbUgya/NBZlOXcVSVJ VC4A1HlPvgYT8h4jGRqPwgY2zuGVWjmaG8XktWnq0f5DZhl+jKPWAqQ9io8VDG5JPZi9WUy62EptF ke2En10br7HbfNqnkGXLB8SSjnyQltwpt9jSPA56fr7JqN6EMmFjV5sD0adAM5jMZ/w53viHtWala vqyhnn31yFLbasQy8QEBH3CQlKF5IPYJAejlAyZDuZX8+9Wfp3L7EjTzWJLQ97O+uIDKJqzVjQ2zx pZDYgNhvrE+aJ/mWWwk6E3aJ1h7cW4wm6twROShXVoITGMBqDmyewMKx157iONlcQ01SE3KseuLv6 K4ZHTxFg==; 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 1cv8GE-0001bm-MK; Mon, 03 Apr 2017 20:07:34 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cv7tV-0005WJ-Fi for linux-arm-kernel@bombadil.infradead.org; Mon, 03 Apr 2017 19:44:05 +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=rZcLE2RXPd13vNnThV7omH2FPcKF75dm84cNyBCASvU=; b=IH+D4LyE4syZSTfu/sneJe5u4 CzFaQGZ1hDXQQMPakW1grcLhn2EP/jLUYY76b1w7SXkkFOJ9qQEApORIRRDT2MYZ6pSMzsMB4BkTx fNo2oCohjF5bihgTxWqoPdrfGlrrmraLuEvumQegEReilC1aNDsrKUNO7nYXgvQki+ediW6optULc vKZ+5UUL2gIEDirITNPbOroAHmmEGP7cestMToZykOofoHIx5C/r8+m0obAv6lHMHB8a5V4SJRFZd eBFPSnUjDI4b4l0sgR21ZifLX2+YBcciBAZFU4WH/bR/Um3BjhPzdiRs651zOc58Gohus5RNENYfd +P6Rp2ZHw==; Received: from mail-qk0-f178.google.com ([209.85.220.178]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cv7JC-0006m2-T7 for linux-arm-kernel@lists.infradead.org; Mon, 03 Apr 2017 19:06:35 +0000 Received: by mail-qk0-f178.google.com with SMTP id d10so123674253qke.1 for ; Mon, 03 Apr 2017 12:06:14 -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=rZcLE2RXPd13vNnThV7omH2FPcKF75dm84cNyBCASvU=; b=WiGFdJYHfxy7FaNIwfiWnq9DSqK5emH/8aQXjaqHhMOrPkrnafECKfA/efy9DxRzgc SiIea67LiRAZnpeEUfoCPODdj+7IpnebJv7ogBkegztN/bK9i1ju9oSdDAX6E/TzpLFC qwSqN6WS9TIKayxq/zAuETvH6Iz8GDlj27fp3ZUK/abHTiFJcyjVg2wli23Kf5zpVaKE Z03juu2IWSbo38iAhZo4Z1JiiNTN8e6ko8c5a9SS1LuYjMYV7fnb7I8M0YpJoEO6PycX 2xhOmcIJ4omkqL0uKAWn7F41G58p+GILESu4jQsPAzxvVL/nB2KPMxkNTIuaaHZzJ02B Md9Q== X-Gm-Message-State: AFeK/H2rQp4BF4yxl9y/84J/bWJ/aAc5RzhGUDrG1EVOoH3bUXBssxHhsEqWnY9HaEGR90td X-Received: by 10.55.50.17 with SMTP id y17mr16534653qky.108.1491245900151; Mon, 03 Apr 2017 11:58:20 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 11:58:19 -0700 (PDT) From: Laura Abbott To: Sumit Semwal , Riley Andrews , arve@android.com Subject: [PATCHv3 03/22] staging: android: ion: Remove dmap_cnt Date: Mon, 3 Apr 2017 11:57:45 -0700 Message-Id: <1491245884-15852-4-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_150634_986722_E3FE4A26 X-CRM114-Status: GOOD ( 10.70 ) 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 The reference counting of dma_map calls was removed. Remove the associated counter field as well. Signed-off-by: Laura Abbott --- drivers/staging/android/ion/ion_priv.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/android/ion/ion_priv.h b/drivers/staging/android/ion/ion_priv.h index 5b3059c..46d3ff5 100644 --- a/drivers/staging/android/ion/ion_priv.h +++ b/drivers/staging/android/ion/ion_priv.h @@ -44,7 +44,6 @@ * @lock: protects the buffers cnt fields * @kmap_cnt: number of times the buffer is mapped to the kernel * @vaddr: the kernel mapping if kmap_cnt is not zero - * @dmap_cnt: number of times the buffer is mapped for dma * @sg_table: the sg table for the buffer if dmap_cnt is not zero * @pages: flat array of pages in the buffer -- used by fault * handler and only valid for buffers that are faulted in @@ -70,7 +69,6 @@ struct ion_buffer { struct mutex lock; int kmap_cnt; void *vaddr; - int dmap_cnt; struct sg_table *sg_table; struct page **pages; struct list_head vmas;