From 8e0b2987e549dcc72b690dd8028007600e4bc8ed Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Mon, 10 Aug 2009 11:53:14 +0900 Subject: [PATCH] --- yaml --- r: 158059 b: refs/heads/master c: 595cc8560783ea31ed1208dc1f97282a2a5606b7 h: refs/heads/master i: 158057: 860a3e5d832b471f20f2240fa1c6cd1f659968d3 158055: 74f74b66db74fee3b4eb64048e5230c13ee7595b v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/pci_sun4v.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 6eea90d894c8..aba0a7175ae5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02f7a18935eef0e56d9180fc3c35da6aad1ff3bb +refs/heads/master: 595cc8560783ea31ed1208dc1f97282a2a5606b7 diff --git a/trunk/arch/sparc/kernel/pci_sun4v.c b/trunk/arch/sparc/kernel/pci_sun4v.c index ee800f927929..23c33ff9c31e 100644 --- a/trunk/arch/sparc/kernel/pci_sun4v.c +++ b/trunk/arch/sparc/kernel/pci_sun4v.c @@ -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,