| Message ID | 20190807150752.17894-1-hch@lst.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f5817191b0a3257d9963a574c53d085d9f443e7d |
| Headers | show |
| Series | powerpc: use <asm-generic/dma-mapping.h> | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (f3365d1a959d5c6527efe3d38276acc9b58e3f3f) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
ping? On Wed, Aug 07, 2019 at 06:07:52PM +0300, Christoph Hellwig wrote: > The powerpc version of dma-mapping.h only contains a version of > get_arch_dma_ops that always return NULL. Replace it with the > asm-generic version that does the same. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/powerpc/include/asm/Kbuild | 1 + > arch/powerpc/include/asm/dma-mapping.h | 18 ------------------ > 2 files changed, 1 insertion(+), 18 deletions(-) > delete mode 100644 arch/powerpc/include/asm/dma-mapping.h > > diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild > index 9a1d2fc6ceb7..15bb09ad5dc2 100644 > --- a/arch/powerpc/include/asm/Kbuild > +++ b/arch/powerpc/include/asm/Kbuild > @@ -4,6 +4,7 @@ generated-y += syscall_table_64.h > generated-y += syscall_table_c32.h > generated-y += syscall_table_spu.h > generic-y += div64.h > +generic-y += dma-mapping.h > generic-y += export.h > generic-y += irq_regs.h > generic-y += local64.h > diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h > deleted file mode 100644 > index 565d6f74b189..000000000000 > --- a/arch/powerpc/include/asm/dma-mapping.h > +++ /dev/null > @@ -1,18 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -/* > - * Copyright (C) 2004 IBM > - */ > -#ifndef _ASM_DMA_MAPPING_H > -#define _ASM_DMA_MAPPING_H > - > -static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) > -{ > - /* We don't handle the NULL dev case for ISA for now. We could > - * do it via an out of line call but it is not needed for now. The > - * only ISA DMA device we support is the floppy and we have a hack > - * in the floppy driver directly to get a device for us. > - */ > - return NULL; > -} > - > -#endif /* _ASM_DMA_MAPPING_H */ > -- > 2.20.1 ---end quoted text---
On Wed, 2019-08-07 at 15:07:52 UTC, Christoph Hellwig wrote: > The powerpc version of dma-mapping.h only contains a version of > get_arch_dma_ops that always return NULL. Replace it with the > asm-generic version that does the same. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/f5817191b0a3257d9963a574c53d085d9f443e7d cheers
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild index 9a1d2fc6ceb7..15bb09ad5dc2 100644 --- a/arch/powerpc/include/asm/Kbuild +++ b/arch/powerpc/include/asm/Kbuild @@ -4,6 +4,7 @@ generated-y += syscall_table_64.h generated-y += syscall_table_c32.h generated-y += syscall_table_spu.h generic-y += div64.h +generic-y += dma-mapping.h generic-y += export.h generic-y += irq_regs.h generic-y += local64.h diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h deleted file mode 100644 index 565d6f74b189..000000000000 --- a/arch/powerpc/include/asm/dma-mapping.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (C) 2004 IBM - */ -#ifndef _ASM_DMA_MAPPING_H -#define _ASM_DMA_MAPPING_H - -static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) -{ - /* We don't handle the NULL dev case for ISA for now. We could - * do it via an out of line call but it is not needed for now. The - * only ISA DMA device we support is the floppy and we have a hack - * in the floppy driver directly to get a device for us. - */ - return NULL; -} - -#endif /* _ASM_DMA_MAPPING_H */
The powerpc version of dma-mapping.h only contains a version of get_arch_dma_ops that always return NULL. Replace it with the asm-generic version that does the same. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/powerpc/include/asm/Kbuild | 1 + arch/powerpc/include/asm/dma-mapping.h | 18 ------------------ 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 arch/powerpc/include/asm/dma-mapping.h