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: 9660273 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 E4EC56032D for ; Mon, 3 Apr 2017 18:58:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8FFD284C2 for ; Mon, 3 Apr 2017 18:58:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD983284F0; Mon, 3 Apr 2017 18:58:22 +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=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9D55D284C2 for ; Mon, 3 Apr 2017 18:58:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 10ABA89DD3; Mon, 3 Apr 2017 18:58:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-f173.google.com (mail-qk0-f173.google.com [209.85.220.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id 14FEC6E3D5 for ; Mon, 3 Apr 2017 18:58:21 +0000 (UTC) Received: by mail-qk0-f173.google.com with SMTP id d10so123462906qke.1 for ; Mon, 03 Apr 2017 11:58:21 -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=sH0451bPT642zQyxfjomKqBlHT7p9/3tZfzY1J0DlLLgwAtdbwCKx+neaBVjW5R6Gs pPHQIzsIwN/1YailOShRJM4K6oiZ5zezKkcjxOiwNzs37Gdj88/XbBUAvk+78TREdfEh rGHTgsouHpHPyBPcw3UIvNnehhu5+tbIy5OJBvsCb6ZTLzk2+kN2N/BOW6wojB4/p/hG rA7nPgOjm3ItnOTLOswPKqE/LvI7H80bbyA0XVZsRkLvGLi2yVbgjsGFsEE2H/I7nXtm mbXuC/mMiZVEAWoKbHiTIsWgldBLg2tIF8yL4UYRjhcBZHqGSSZSvqOo1tO9+6iqI/CH gvLA== X-Gm-Message-State: AFeK/H0OQ5VkYTboOvyyPBP7wLms3Uc8CYO17MfFFjfMvAAq3DvSSG3pn3d5qIkSbzfrdntk 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> 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 , Daniel Vetter , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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;