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: 9660391 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 3D1406032D for ; Mon, 3 Apr 2017 19:03:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 323F5284C2 for ; Mon, 3 Apr 2017 19:03:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25890284F0; Mon, 3 Apr 2017 19:03:41 +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=unavailable 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 BA92A284C2 for ; Mon, 3 Apr 2017 19:03:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752929AbdDCTDi (ORCPT ); Mon, 3 Apr 2017 15:03:38 -0400 Received: from mail-qk0-f176.google.com ([209.85.220.176]:33586 "EHLO mail-qk0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752426AbdDCS6g (ORCPT ); Mon, 3 Apr 2017 14:58:36 -0400 Received: by mail-qk0-f176.google.com with SMTP id h67so24171455qke.0 for ; Mon, 03 Apr 2017 11:58:20 -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=LnDbuR1mnDRlASZoBs2/49Ica3nt/OPQflFVoMDvGghL4DzxSKnB0etKsFkh9wJYzW 35XSoI6XnrBIpOK7fp8j3aKGGq/QAhadOvqHtEPa8GjQoL4UlOf99Z3UjX/9fVmAb7W/ oUMkbZGfFxGN6UZWWwktVf6v8EH9pnaaxsSSUVzMi0/28mm8thQNIEggNgRVJjvaZgRy 0dy6G4EeCiJSCKdU1Bbi37tZlaeUHK6bgQgq35hF6O2b9YqMVg4TLLVFRs7pb2rcnm7D TB7McM4ka/klLPSZkZUbv0mXkMxG1XH1SK0NXdsXrvHxwAksrTqd2ulOW+hal/BrwlTK 3IJQ== X-Gm-Message-State: AFeK/H13k/vfdaf8dyyRuHzoQzzvjYQ+RqiB8Zl0lv7jtBnIILmYbmXxf+4P/xJ6DoeOfy/j 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 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: [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> 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;