From a3124c00d57c7bf8e40eb37d9656581ae4eefa8f Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Thu, 14 Feb 2019 15:51:56 +0100 Subject: [PATCH] ARM: davinci: remove intc_host_map from davinci_soc_info struct The intc_host_map field in struct davinci_soc_info is not used by any board. Remove it as part of the interrupt support cleanup. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner Signed-off-by: Sekhar Nori --- arch/arm/mach-davinci/cp_intc.c | 5 ----- arch/arm/mach-davinci/include/mach/common.h | 1 - 2 files changed, 6 deletions(-) diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 94085d21018e..67805ca74ff8 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -117,7 +117,6 @@ int __init cp_intc_of_init(struct device_node *node, struct device_node *parent) { u32 num_irq = davinci_soc_info.intc_irq_num; u8 *irq_prio = davinci_soc_info.intc_irq_prios; - u32 *host_map = davinci_soc_info.intc_host_map; unsigned num_reg = BITS_TO_LONGS(num_irq); int i, irq_base; @@ -182,10 +181,6 @@ int __init cp_intc_of_init(struct device_node *node, struct device_node *parent) cp_intc_write(0x0f0f0f0f, CP_INTC_CHAN_MAP(i)); } - if (host_map) - for (i = 0; host_map[i] != -1; i++) - cp_intc_write(host_map[i], CP_INTC_HOST_MAP(i)); - irq_base = irq_alloc_descs(-1, 0, num_irq, 0); if (irq_base < 0) { pr_warn("Couldn't allocate IRQ numbers\n"); diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index b577e13a9c23..944afd57ee38 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -61,7 +61,6 @@ struct davinci_soc_info { int intc_type; u8 *intc_irq_prios; unsigned long intc_irq_num; - u32 *intc_host_map; struct davinci_timer_info *timer_info; int gpio_type; u32 gpio_base; -- 2.11.0