Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 595cc856 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Ingo Molnar
Browse files

sparc: Remove no-op dma_4v_sync_single_for_cpu and dma_4v_sync_sg_for_cpu 



Now sparc uses include/asm-generic/dma-mapping-common.h.
pci_sun4v.c doesn't need to have no-op
dma_4v_sync_single_for_cpu and dma_4v_sync_sg_for_cpu
(dma-mapping-common.h does nothing if sync_{single|sg}_for_cpu
hook is not defined). So we can remove them safely.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tested-by: default avatarRobert Reif <reif@earthlink.net>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: tony.luck@intel.com
Cc: fenghua.yu@intel.com
LKML-Reference: <1249872797-1314-6-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 02f7a189

arch/sparc/kernel/pci_sun4v.c

+0 −16
Original line number Diff line number Diff line
@@ -525,20 +525,6 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist, 
	spin_unlock_irqrestore(&iommu->lock, flags);

}



static void dma_4v_sync_single_for_cpu(struct device *dev,

				       dma_addr_t bus_addr, size_t sz,

				       enum dma_data_direction direction)

{

	/* Nothing to do... */

}



static void dma_4v_sync_sg_for_cpu(struct device *dev,

				   struct scatterlist *sglist, int nelems,

				   enum dma_data_direction direction)

{

	/* Nothing to do... */

}



static struct dma_map_ops sun4v_dma_ops = {

	.alloc_coherent			= dma_4v_alloc_coherent,

	.free_coherent			= dma_4v_free_coherent,
@@ -546,8 +532,6 @@ static struct dma_map_ops sun4v_dma_ops = { 
	.unmap_page			= dma_4v_unmap_page,

	.map_sg				= dma_4v_map_sg,

	.unmap_sg			= dma_4v_unmap_sg,

	.sync_single_for_cpu		= dma_4v_sync_single_for_cpu,

	.sync_sg_for_cpu		= dma_4v_sync_sg_for_cpu,

};



static void __devinit pci_sun4v_scan_bus(struct pci_pbm_info *pbm,