From patchwork Sat Mar 18 00:54:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9631925 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 5739960245 for ; Sat, 18 Mar 2017 01:31:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D76F2836D for ; Sat, 18 Mar 2017 01:31:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2FCDC28511; Sat, 18 Mar 2017 01:31:11 +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 C59092836D for ; Sat, 18 Mar 2017 01:31:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751117AbdCRBbK (ORCPT ); Fri, 17 Mar 2017 21:31:10 -0400 Received: from mail-qt0-f177.google.com ([209.85.216.177]:36334 "EHLO mail-qt0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751107AbdCRBbJ (ORCPT ); Fri, 17 Mar 2017 21:31:09 -0400 Received: by mail-qt0-f177.google.com with SMTP id r45so75455229qte.3 for ; Fri, 17 Mar 2017 18:30:53 -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=S9RqD66/gkOHH/pQc27LK08rxwKKjAheHePR0sYCsjI=; b=SL9o1Y6aCzp0kpOuif26+rftwooUSpaFE0NU9xiECJ4tRxyN7SHYBq3v/hjPJxWDne tBYpLcEa3tGlHCys/VwJbQnWBm7xAhEAiRW1mfiuWtlwxECxu0GWFhdvwvNesWGXwC8U YtjSJ4+OzOFqnZvqf/aCDoDe5s73z+RA7ALh8LvXaZ4MQ4s1h6DWmF1PsaDKb8S+cTrm BeEYuaBoW5kqsUMIGTiAKYPa8s9L3fwdvkTOyCTQRWP52JrjBzEHVYNAlYnsDA9dg8py xD1Biq1SuxzKLr8HNbX9EEb1jyQtrm5OLjj93IQVyL106WT4IreUXFY6YjUiE3FgoYeJ CmCA== X-Gm-Message-State: AFeK/H0e3lvJzsTZJVAfpNJCA3w/fR7TRs+2P/ocPUOc//ef+fy4IxxjlD1dTJ2QZxNKWcM/ X-Received: by 10.200.50.112 with SMTP id y45mr15974368qta.75.1489798509650; Fri, 17 Mar 2017 17:55:09 -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.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2017 17:55:08 -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 03/21] staging: android: ion: Remove dmap_cnt Date: Fri, 17 Mar 2017 17:54:35 -0700 Message-Id: <1489798493-16600-4-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 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;