| Message ID | 20191113073539.9660-4-hch@lst.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | cb6f6392dbefb45b6aabd9a6f566440ef642b6f8 |
| Headers | show |
| Series | [1/3] dma-direct: unify the dma_capable definitions | expand |
Christoph Hellwig <hch@lst.de> writes: > Support for calling the DMA API functions without a valid device pointer > was removed a while ago, so remove the stale support for that from the > powerpc __phys_to_dma / __dma_to_phys helpers. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/powerpc/include/asm/dma-direct.h | 4 ---- > 1 file changed, 4 deletions(-) Acked-by: Michael Ellerman <mpe@ellerman.id.au> cheers > diff --git a/arch/powerpc/include/asm/dma-direct.h b/arch/powerpc/include/asm/dma-direct.h > index e29e8a236b8d..abc154d784b0 100644 > --- a/arch/powerpc/include/asm/dma-direct.h > +++ b/arch/powerpc/include/asm/dma-direct.h > @@ -4,15 +4,11 @@ > > static inline dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr) > { > - if (!dev) > - return paddr + PCI_DRAM_OFFSET; > return paddr + dev->archdata.dma_offset; > } > > static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr) > { > - if (!dev) > - return daddr - PCI_DRAM_OFFSET; > return daddr - dev->archdata.dma_offset; > } > #endif /* ASM_POWERPC_DMA_DIRECT_H */ > -- > 2.20.1
diff --git a/arch/powerpc/include/asm/dma-direct.h b/arch/powerpc/include/asm/dma-direct.h index e29e8a236b8d..abc154d784b0 100644 --- a/arch/powerpc/include/asm/dma-direct.h +++ b/arch/powerpc/include/asm/dma-direct.h @@ -4,15 +4,11 @@ static inline dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr) { - if (!dev) - return paddr + PCI_DRAM_OFFSET; return paddr + dev->archdata.dma_offset; } static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr) { - if (!dev) - return daddr - PCI_DRAM_OFFSET; return daddr - dev->archdata.dma_offset; } #endif /* ASM_POWERPC_DMA_DIRECT_H */
Support for calling the DMA API functions without a valid device pointer was removed a while ago, so remove the stale support for that from the powerpc __phys_to_dma / __dma_to_phys helpers. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/powerpc/include/asm/dma-direct.h | 4 ---- 1 file changed, 4 deletions(-)