sparc: remove not needed sbus_dma_ops methods (7227b202) · Commits · 戴 / test

No need to BUG_ON() on the cache maintainance ops - they are no-ops by default, and there is nothing in the DMA API contract that prohibits calling them on sbus devices (even if such drivers are unlikely to ever appear). Similarly a dma_supported method that always returns 0 is rather pointless. The only thing that indicates is that no one ever calls the method on sbus devices. Signed-off-by:

Christoph Hellwig <hch@lst.de> Acked-by:

David S. Miller <davem@davemloft.net>

arch/sparc/kernel/ioport.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -391,23 +391,6 @@ static void sbus_unmap_sg(struct device dev, struct scatterlist sg, int n,
		mmu_release_scsi_sgl(dev, sg, n);
		}

		static void sbus_sync_sg_for_cpu(struct device dev, struct scatterlist sg,
		int n, enum dma_data_direction dir)
		{
		BUG();
		}

		static void sbus_sync_sg_for_device(struct device dev, struct scatterlist sg,
		int n, enum dma_data_direction dir)
		{
		BUG();
		}

		static int sbus_dma_supported(struct device *dev, u64 mask)
		{
		return 0;
		}

		static const struct dma_map_ops sbus_dma_ops = {
		.alloc = sbus_alloc_coherent,
		.free = sbus_free_coherent,
		@@ -415,9 +398,6 @@ static const struct dma_map_ops sbus_dma_ops = {
		.unmap_page = sbus_unmap_page,
		.map_sg = sbus_map_sg,
		.unmap_sg = sbus_unmap_sg,
		.sync_sg_for_cpu = sbus_sync_sg_for_cpu,
		.sync_sg_for_device = sbus_sync_sg_for_device,
		.dma_supported = sbus_dma_supported,
		};

		static int __init sparc_register_ioport(void)

Admin message