Commit 44899aa3 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

s390: remove the mapping_error dma_map_ops method 



S390 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 122da4e0

arch/s390/pci/pci_dma.c

+5 −13
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
#include <linux/pci.h>

#include <asm/pci_dma.h>



#define S390_MAPPING_ERROR		(~(dma_addr_t) 0x0)



static struct kmem_cache *dma_region_table_cache;

static struct kmem_cache *dma_page_table_cache;

static int s390_iommu_strict;
@@ -301,7 +299,7 @@ static dma_addr_t dma_alloc_address(struct device *dev, int size) 


out_error:

	spin_unlock_irqrestore(&zdev->iommu_bitmap_lock, flags);

	return S390_MAPPING_ERROR;

	return DMA_MAPPING_ERROR;

}



static void dma_free_address(struct device *dev, dma_addr_t dma_addr, int size)
@@ -349,7 +347,7 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, 
	/* This rounds up number of pages based on size and offset */

	nr_pages = iommu_num_pages(pa, size, PAGE_SIZE);

	dma_addr = dma_alloc_address(dev, nr_pages);

	if (dma_addr == S390_MAPPING_ERROR) {

	if (dma_addr == DMA_MAPPING_ERROR) {

		ret = -ENOSPC;

		goto out_err;

	}
@@ -372,7 +370,7 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, 
out_err:

	zpci_err("map error:\n");

	zpci_err_dma(ret, pa);

	return S390_MAPPING_ERROR;

	return DMA_MAPPING_ERROR;

}



static void s390_dma_unmap_pages(struct device *dev, dma_addr_t dma_addr,
@@ -449,7 +447,7 @@ static int __s390_dma_map_sg(struct device *dev, struct scatterlist *sg, 
	int ret;



	dma_addr_base = dma_alloc_address(dev, nr_pages);

	if (dma_addr_base == S390_MAPPING_ERROR)

	if (dma_addr_base == DMA_MAPPING_ERROR)

		return -ENOMEM;



	dma_addr = dma_addr_base;
@@ -496,7 +494,7 @@ static int s390_dma_map_sg(struct device *dev, struct scatterlist *sg, 
	for (i = 1; i < nr_elements; i++) {

		s = sg_next(s);



		s->dma_address = S390_MAPPING_ERROR;

		s->dma_address = DMA_MAPPING_ERROR;

		s->dma_length = 0;



		if (s->offset || (size & ~PAGE_MASK) ||
@@ -546,11 +544,6 @@ static void s390_dma_unmap_sg(struct device *dev, struct scatterlist *sg, 
	}

}

	

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

{

	return dma_addr == S390_MAPPING_ERROR;

}



int zpci_dma_init_device(struct zpci_dev *zdev)

{

	int rc;
@@ -675,7 +668,6 @@ const struct dma_map_ops s390_pci_dma_ops = { 
	.unmap_sg	= s390_dma_unmap_sg,

	.map_page	= s390_dma_map_pages,

	.unmap_page	= s390_dma_unmap_pages,

	.mapping_error	= s390_mapping_error,

	/* dma_supported is unconditionally true without a callback */

};

EXPORT_SYMBOL_GPL(s390_pci_dma_ops);