From fc5bad03709f9c79ea299f554b6f99fc6f4fe31c Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 13 Aug 2019 09:25:03 +0200 Subject: ia64: remove the hpsim platform The hpsim platform supports the HP IA64 simulator which was useful as a bring up platform. But it is fairly non-standard vs real IA64 system in that it for example doesn't support ACPI. It also comes with a whole bunch of simulator specific drivers. Remove it to simplify the IA64 port. Note that through a weird twist only them hpsim boot loader built the vmlinux.gz file, so the makefile targets for that are moved to the main ia64 Makefile now. Acked-by: Tom Vaden Signed-off-by: Christoph Hellwig Link: https://lkml.kernel.org/r/20190813072514.23299-18-hch@lst.de Signed-off-by: Tony Luck --- arch/ia64/include/asm/machvec.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'arch/ia64/include/asm/machvec.h') diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h index f426a9829595..5a9a8af79308 100644 --- a/arch/ia64/include/asm/machvec.h +++ b/arch/ia64/include/asm/machvec.h @@ -16,7 +16,6 @@ struct device; typedef void ia64_mv_setup_t (char **); -typedef void ia64_mv_irq_init_t (void); typedef void ia64_mv_dma_init (void); typedef const struct dma_map_ops *ia64_mv_dma_get_ops(struct device *); @@ -27,9 +26,7 @@ machvec_noop (void) extern void machvec_setup (char **); -# if defined (CONFIG_IA64_HP_SIM) -# include -# elif defined (CONFIG_IA64_DIG) +# if defined (CONFIG_IA64_DIG) # include # elif defined(CONFIG_IA64_DIG_VTD) # include @@ -46,7 +43,6 @@ extern void machvec_setup (char **); # else # define ia64_platform_name ia64_mv.name # define platform_setup ia64_mv.setup -# define platform_irq_init ia64_mv.irq_init # define platform_dma_init ia64_mv.dma_init # define platform_dma_get_ops ia64_mv.dma_get_ops # endif @@ -59,7 +55,6 @@ extern void machvec_setup (char **); struct ia64_machine_vector { const char *name; ia64_mv_setup_t *setup; - ia64_mv_irq_init_t *irq_init; ia64_mv_dma_init *dma_init; ia64_mv_dma_get_ops *dma_get_ops; } __attribute__((__aligned__(16))); /* align attrib? see above comment */ @@ -68,7 +63,6 @@ struct ia64_machine_vector { { \ #name, \ platform_setup, \ - platform_irq_init, \ platform_dma_init, \ platform_dma_get_ops, \ } @@ -91,9 +85,6 @@ extern const struct dma_map_ops *dma_get_ops(struct device *); #ifndef platform_setup # define platform_setup machvec_setup #endif -#ifndef platform_irq_init -# define platform_irq_init machvec_noop -#endif #ifndef platform_dma_init # define platform_dma_init swiotlb_dma_init #endif -- cgit v1.2.3