From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934038AbbLVWYy (ORCPT ); Tue, 22 Dec 2015 17:24:54 -0500 Received: from 8bytes.org ([81.169.241.247]:47631 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755430AbbLVWWE (ORCPT ); Tue, 22 Dec 2015 17:22:04 -0500 From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, joro@8bytes.org, jroedel@suse.de Subject: [PATCH 11/23] iommu/amd: Remove 'start' parameter from dma_ops_area_alloc Date: Tue, 22 Dec 2015 23:21:16 +0100 Message-Id: <1450822888-22590-12-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450822888-22590-1-git-send-email-joro@8bytes.org> References: <1450822888-22590-1-git-send-email-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joerg Roedel Parameter is not needed because the value is part of the already passed in struct dma_ops_domain. Signed-off-by: Joerg Roedel --- drivers/iommu/amd_iommu.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index eb11996..2962c62 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -1561,11 +1561,10 @@ static unsigned long dma_ops_area_alloc(struct device *dev, struct dma_ops_domain *dom, unsigned int pages, unsigned long align_mask, - u64 dma_mask, - unsigned long start) + u64 dma_mask) { int max_index = dom->aperture_size >> APERTURE_RANGE_SHIFT; - int i = start >> APERTURE_RANGE_SHIFT; + int i = dom->next_address >> APERTURE_RANGE_SHIFT; unsigned long next_bit, boundary_size, mask; unsigned long address = -1; @@ -1612,13 +1611,12 @@ static unsigned long dma_ops_alloc_addresses(struct device *dev, dom->need_flush = true; #endif - address = dma_ops_area_alloc(dev, dom, pages, align_mask, - dma_mask, dom->next_address); + address = dma_ops_area_alloc(dev, dom, pages, align_mask, dma_mask); if (address == -1) { dom->next_address = 0; address = dma_ops_area_alloc(dev, dom, pages, align_mask, - dma_mask, 0); + dma_mask); dom->need_flush = true; } -- 1.9.1