Merge tag 'please-pull-next' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...

[linux-2.6-block.git] / arch / ia64 / sn / pci / pci_dma.c

diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
index 96eb2567718a29e71dbcf9e91bf01ed1e4ff80d8..4ce4ee4ef9f2c7b74b48fdc19c2d4706f6fab173 100644 (file)
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
@@ -314,31 +314,6 @@ static int sn_dma_map_sg(struct device *dev, struct scatterlist *sgl,
        return nhwentries;
 }
 
-static void sn_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
-                                      size_t size, enum dma_data_direction dir)
-{
-       BUG_ON(!dev_is_pci(dev));
-}
-
-static void sn_dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
-                                         size_t size,
-                                         enum dma_data_direction dir)
-{
-       BUG_ON(!dev_is_pci(dev));
-}
-
-static void sn_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
-                                  int nelems, enum dma_data_direction dir)
-{
-       BUG_ON(!dev_is_pci(dev));
-}
-
-static void sn_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
-                                     int nelems, enum dma_data_direction dir)
-{
-       BUG_ON(!dev_is_pci(dev));
-}
-
 static int sn_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
        return 0;
@@ -466,10 +441,6 @@ static struct dma_map_ops sn_dma_ops = {
        .unmap_page             = sn_dma_unmap_page,
        .map_sg                 = sn_dma_map_sg,
        .unmap_sg               = sn_dma_unmap_sg,
-       .sync_single_for_cpu    = sn_dma_sync_single_for_cpu,
-       .sync_sg_for_cpu        = sn_dma_sync_sg_for_cpu,
-       .sync_single_for_device = sn_dma_sync_single_for_device,
-       .sync_sg_for_device     = sn_dma_sync_sg_for_device,
        .mapping_error          = sn_dma_mapping_error,
        .dma_supported          = sn_dma_supported,
        .get_required_mask      = sn_dma_get_required_mask,