mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

PCI: Remove NULL device handling from PCI DMA API

Browse source 
Historically some ISA drivers used the old PCI DMA API with a NULL pdev
argument, but these days this isn't used and not too useful due to the
per-device DMA ops, so remove it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Christoph Hellwig 2018-01-10 19:03:22 +01:00 committed by Bjorn Helgaas
parent c08fa1608d
commit 4167b2ad51
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
include/linux/pci-dma-compat.h
View file

@ -17,91 +17,90 @@ static inline void *
pci_alloc_consistent(struct pci_dev *hwdev, size_t size, pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
dma_addr_t *dma_handle) dma_addr_t *dma_handle)
{ {
return dma_alloc_coherent(hwdev == NULL ? NULL : &hwdev->dev, size, dma_handle, GFP_ATOMIC); return dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC);
} }
static inline void * static inline void *
pci_zalloc_consistent(struct pci_dev *hwdev, size_t size, pci_zalloc_consistent(struct pci_dev *hwdev, size_t size,
dma_addr_t *dma_handle) dma_addr_t *dma_handle)
{ {
return dma_zalloc_coherent(hwdev == NULL ? NULL : &hwdev->dev, return dma_zalloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC);
size, dma_handle, GFP_ATOMIC);
} }
static inline void static inline void
pci_free_consistent(struct pci_dev *hwdev, size_t size, pci_free_consistent(struct pci_dev *hwdev, size_t size,
void *vaddr, dma_addr_t dma_handle) void *vaddr, dma_addr_t dma_handle)
{ {
dma_free_coherent(hwdev == NULL ? NULL : &hwdev->dev, size, vaddr, dma_handle); dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle);
} }
static inline dma_addr_t static inline dma_addr_t
pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, int direction) pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, int direction)
{ {
return dma_map_single(hwdev == NULL ? NULL : &hwdev->dev, ptr, size, (enum dma_data_direction)direction); return dma_map_single(&hwdev->dev, ptr, size, (enum dma_data_direction)direction);
} }
static inline void static inline void
pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr,
size_t size, int direction) size_t size, int direction)
{ {
dma_unmap_single(hwdev == NULL ? NULL : &hwdev->dev, dma_addr, size, (enum dma_data_direction)direction); dma_unmap_single(&hwdev->dev, dma_addr, size, (enum dma_data_direction)direction);
} }
static inline dma_addr_t static inline dma_addr_t
pci_map_page(struct pci_dev *hwdev, struct page *page, pci_map_page(struct pci_dev *hwdev, struct page *page,
unsigned long offset, size_t size, int direction) unsigned long offset, size_t size, int direction)
{ {
return dma_map_page(hwdev == NULL ? NULL : &hwdev->dev, page, offset, size, (enum dma_data_direction)direction); return dma_map_page(&hwdev->dev, page, offset, size, (enum dma_data_direction)direction);
} }
static inline void static inline void
pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address, pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address,
size_t size, int direction) size_t size, int direction)
{ {
dma_unmap_page(hwdev == NULL ? NULL : &hwdev->dev, dma_address, size, (enum dma_data_direction)direction); dma_unmap_page(&hwdev->dev, dma_address, size, (enum dma_data_direction)direction);
} }
static inline int static inline int
pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,
int nents, int direction) int nents, int direction)
{ {
return dma_map_sg(hwdev == NULL ? NULL : &hwdev->dev, sg, nents, (enum dma_data_direction)direction); return dma_map_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction);
} }
static inline void static inline void
pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg, pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg,
int nents, int direction) int nents, int direction)
{ {
dma_unmap_sg(hwdev == NULL ? NULL : &hwdev->dev, sg, nents, (enum dma_data_direction)direction); dma_unmap_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction);
} }
static inline void static inline void
pci_dma_sync_single_for_cpu(struct pci_dev *hwdev, dma_addr_t dma_handle, pci_dma_sync_single_for_cpu(struct pci_dev *hwdev, dma_addr_t dma_handle,
size_t size, int direction) size_t size, int direction)
{ {
dma_sync_single_for_cpu(hwdev == NULL ? NULL : &hwdev->dev, dma_handle, size, (enum dma_data_direction)direction); dma_sync_single_for_cpu(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction);
} }
static inline void static inline void
pci_dma_sync_single_for_device(struct pci_dev *hwdev, dma_addr_t dma_handle, pci_dma_sync_single_for_device(struct pci_dev *hwdev, dma_addr_t dma_handle,
size_t size, int direction) size_t size, int direction)
{ {
dma_sync_single_for_device(hwdev == NULL ? NULL : &hwdev->dev, dma_handle, size, (enum dma_data_direction)direction); dma_sync_single_for_device(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction);
} }
static inline void static inline void
pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sg, pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sg,
int nelems, int direction) int nelems, int direction)
{ {
dma_sync_sg_for_cpu(hwdev == NULL ? NULL : &hwdev->dev, sg, nelems, (enum dma_data_direction)direction); dma_sync_sg_for_cpu(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction);
} }
static inline void static inline void
pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sg, pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sg,
int nelems, int direction) int nelems, int direction)
{ {
dma_sync_sg_for_device(hwdev == NULL ? NULL : &hwdev->dev, sg, nelems, (enum dma_data_direction)direction); dma_sync_sg_for_device(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction);
} }
static inline int static inline int