Commit 02b4da5f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tony Luck
Browse files

intel-iommu: mark intel_dma_ops static 



ia64 currently explicitly assigns it to dma_ops, but that same work is
already done by intel_iommu_init a little later, so we can remove the
duplicate assignment and mark the variable static.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 9aa1fbc5

arch/ia64/kernel/pci-dma.c

+0 −4
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ int force_iommu __read_mostly; 


int iommu_pass_through;



extern struct dma_map_ops intel_dma_ops;



static int __init pci_iommu_init(void)

{

	if (iommu_detected)
@@ -39,8 +37,6 @@ fs_initcall(pci_iommu_init); 


void __init pci_iommu_alloc(void)

{

	dma_ops = &intel_dma_ops;



	/*

	 * The order of these functions is important for

	 * fall-back/fail-over reasons

drivers/iommu/intel-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -3895,7 +3895,7 @@ static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr) 
	return !dma_addr;

}



const struct dma_map_ops intel_dma_ops = {

static const struct dma_map_ops intel_dma_ops = {

	.alloc = intel_alloc_coherent,

	.free = intel_free_coherent,

	.map_sg = intel_map_sg,

CRA Git | Maintained and supported by SUSTech CRA and CCSE