From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932173AbbE1QpB (ORCPT ); Thu, 28 May 2015 12:45:01 -0400 Received: from 8bytes.org ([81.169.241.247]:57685 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754245AbbE1QmS (ORCPT ); Thu, 28 May 2015 12:42:18 -0400 From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: Will Deacon , Kukjin Kim , David Woodhouse , Heiko Stuebner , Hiroshi Doyu , Thierry Reding , Alex Williamson , Robin Murphy , Laurent Pinchart , Oded Gabbay , joro@8bytes.org, jroedel@suse.de, linux-kernel@vger.kernel.org Subject: [PATCH 20/22] iommu/amd: Get rid of device_dma_ops_init() Date: Thu, 28 May 2015 18:41:43 +0200 Message-Id: <1432831305-11126-21-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432831305-11126-1-git-send-email-joro@8bytes.org> References: <1432831305-11126-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 With device intialization done in the add_device call-back now there is no reason for this function anymore. Signed-off-by: Joerg Roedel --- drivers/iommu/amd_iommu.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 8682786..978741b 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2268,6 +2268,7 @@ static int amd_iommu_add_device(struct device *dev) ret = iommu_init_device(dev); if (ret == -ENOTSUPP) { iommu_ignore_device(dev); + dev->archdata.dma_ops = &nommu_dma_ops; goto out; } init_iommu_group(dev); @@ -2840,36 +2841,6 @@ static struct dma_map_ops amd_iommu_dma_ops = { .dma_supported = amd_iommu_dma_supported, }; -static unsigned device_dma_ops_init(void) -{ - struct iommu_dev_data *dev_data; - struct pci_dev *pdev = NULL; - unsigned unhandled = 0; - - for_each_pci_dev(pdev) { - if (!check_device(&pdev->dev)) { - - iommu_ignore_device(&pdev->dev); - - unhandled += 1; - continue; - } - - dev_data = get_dev_data(&pdev->dev); - - if (!dev_data->passthrough) - pdev->dev.archdata.dma_ops = &amd_iommu_dma_ops; - else - pdev->dev.archdata.dma_ops = &nommu_dma_ops; - } - - return unhandled; -} - -/* - * The function which clues the AMD IOMMU driver into dma_ops. - */ - void __init amd_iommu_init_api(void) { bus_set_iommu(&pci_bus_type, &amd_iommu_ops); @@ -2877,18 +2848,9 @@ void __init amd_iommu_init_api(void) int __init amd_iommu_init_dma_ops(void) { - int unhandled; - iommu_detected = 1; swiotlb = 0; - /* Make the driver finally visible to the drivers */ - unhandled = device_dma_ops_init(); - if (unhandled && max_pfn > MAX_DMA32_PFN) { - /* There are unhandled devices - initialize swiotlb for them */ - swiotlb = 1; - } - amd_iommu_stats_init(); if (amd_iommu_unmap_flush) -- 1.9.1