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

Commit fb1b53f1 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

parisc/sba_iommu: remove the mapping_error dma_map_ops method 



The SBA iommu code already returns (~(dma_addr_t)0x0) on mapping
failures, so we can switch over to returning DMA_MAPPING_ERROR and let
the core dma-mapping code handle the rest.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 748c3c4d

drivers/parisc/sba_iommu.c

+1 −9
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ 


#define DEFAULT_DMA_HINT_REG	0



#define SBA_MAPPING_ERROR    (~(dma_addr_t)0)



struct sba_device *sba_list;

EXPORT_SYMBOL_GPL(sba_list);
@@ -725,7 +723,7 @@ sba_map_single(struct device *dev, void *addr, size_t size, 


	ioc = GET_IOC(dev);

	if (!ioc)

		return SBA_MAPPING_ERROR;

		return DMA_MAPPING_ERROR;



	/* save offset bits */

	offset = ((dma_addr_t) (long) addr) & ~IOVP_MASK;
@@ -1080,11 +1078,6 @@ sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents, 


}



static int sba_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return dma_addr == SBA_MAPPING_ERROR;

}



static const struct dma_map_ops sba_ops = {

	.dma_supported =	sba_dma_supported,

	.alloc =		sba_alloc,
@@ -1093,7 +1086,6 @@ static const struct dma_map_ops sba_ops = { 
	.unmap_page =		sba_unmap_page,

	.map_sg =		sba_map_sg,

	.unmap_sg =		sba_unmap_sg,

	.mapping_error =	sba_mapping_error,

};