diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-13 09:25:06 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2019-08-16 11:33:57 -0700 |
| commit | df43acac8e32e2ee51a1e9376993c5ac18598d92 (patch) | |
| tree | fd86e0604c0485dd2116e38575806f93189bddb3 /arch/ia64/include/asm/machvec.h | |
| parent | 2e0f2b1659ddd7bb005ca0bf9f92915904974676 (diff) | |
ia64: remove the zx1 swiotlb machvec
The aim of this machvec is to support devices with < 32-bit dma
masks. But given that ia64 only has a ZONE_DMA32 and not a ZONE_DMA
that isn't supported by swiotlb either.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-21-hch@lst.de
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/include/asm/machvec.h')
| -rw-r--r-- | arch/ia64/include/asm/machvec.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h index 5a9a8af79308..fa867e980d87 100644 --- a/arch/ia64/include/asm/machvec.h +++ b/arch/ia64/include/asm/machvec.h @@ -17,12 +17,6 @@ struct device; typedef void ia64_mv_setup_t (char **); typedef void ia64_mv_dma_init (void); -typedef const struct dma_map_ops *ia64_mv_dma_get_ops(struct device *); - -static inline void -machvec_noop (void) -{ -} extern void machvec_setup (char **); @@ -32,8 +26,6 @@ extern void machvec_setup (char **); # include <asm/machvec_dig_vtd.h> # elif defined (CONFIG_IA64_HP_ZX1) # include <asm/machvec_hpzx1.h> -# elif defined (CONFIG_IA64_HP_ZX1_SWIOTLB) -# include <asm/machvec_hpzx1_swiotlb.h> # elif defined (CONFIG_IA64_SGI_UV) # include <asm/machvec_uv.h> # elif defined (CONFIG_IA64_GENERIC) @@ -44,7 +36,6 @@ extern void machvec_setup (char **); # define ia64_platform_name ia64_mv.name # define platform_setup ia64_mv.setup # define platform_dma_init ia64_mv.dma_init -# define platform_dma_get_ops ia64_mv.dma_get_ops # endif /* __attribute__((__aligned__(16))) is required to make size of the @@ -56,7 +47,6 @@ struct ia64_machine_vector { const char *name; ia64_mv_setup_t *setup; ia64_mv_dma_init *dma_init; - ia64_mv_dma_get_ops *dma_get_ops; } __attribute__((__aligned__(16))); /* align attrib? see above comment */ #define MACHVEC_INIT(name) \ @@ -64,7 +54,6 @@ struct ia64_machine_vector { #name, \ platform_setup, \ platform_dma_init, \ - platform_dma_get_ops, \ } extern struct ia64_machine_vector ia64_mv; @@ -76,7 +65,6 @@ extern void machvec_init_from_cmdline(const char *cmdline); # endif /* CONFIG_IA64_GENERIC */ extern void swiotlb_dma_init(void); -extern const struct dma_map_ops *dma_get_ops(struct device *); /* * Define default versions so we can extend machvec for new platforms without having @@ -88,8 +76,5 @@ extern const struct dma_map_ops *dma_get_ops(struct device *); #ifndef platform_dma_init # define platform_dma_init swiotlb_dma_init #endif -#ifndef platform_dma_get_ops -# define platform_dma_get_ops dma_get_ops -#endif #endif /* _ASM_IA64_MACHVEC_H */ |