The patch titled
Subject: sparc: use generic dma_set_mask
has been removed from the -mm tree. Its filename was
sparc-use-generic-dma_set_mask.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <hch@xxxxxx>
Subject: sparc: use generic dma_set_mask
Sparc already uses the same code as the generic code for the PCI
implementation but just fails the call sbus. This moves to the
generic implemenation which eventually return -EIO due to the NULL
dma_mask pointer in the device.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Cc: Joerg Roedel <jroedel@xxxxxxx>
Cc: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/sparc/include/asm/dma-mapping.h | 15 ---------------
1 file changed, 15 deletions(-)
diff -puN arch/sparc/include/asm/dma-mapping.h~sparc-use-generic-dma_set_mask arch/sparc/include/asm/dma-mapping.h
--- a/arch/sparc/include/asm/dma-mapping.h~sparc-use-generic-dma_set_mask
+++ a/arch/sparc/include/asm/dma-mapping.h
@@ -37,21 +37,6 @@ static inline struct dma_map_ops *get_dm
return dma_ops;
}
-#define HAVE_ARCH_DMA_SET_MASK 1
-
-static inline int dma_set_mask(struct device *dev, u64 mask)
-{
-#ifdef CONFIG_PCI
- if (dev->bus == &pci_bus_type) {
- if (!dev->dma_mask || !dma_supported(dev, mask))
- return -EINVAL;
- *dev->dma_mask = mask;
- return 0;
- }
-#endif
- return -EINVAL;
-}
-
#include <asm-generic/dma-mapping-common.h>
#endif
_
Patches currently in -mm which might be from hch@xxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
