From: Hirokazu Takata This patch removes unnecessary struct icu_data_t definitions of arch/m32r/kernel/setup_*.c. Signed-off-by: Hayato Fujiwara Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton --- arch/m32r/kernel/setup_m32104ut.c | 6 ------ arch/m32r/kernel/setup_m32700ut.c | 8 -------- arch/m32r/kernel/setup_mappi.c | 6 ------ arch/m32r/kernel/setup_mappi2.c | 6 ------ arch/m32r/kernel/setup_mappi3.c | 6 ------ arch/m32r/kernel/setup_oaks32r.c | 6 ------ arch/m32r/kernel/setup_opsput.c | 8 -------- arch/m32r/kernel/setup_usrv.c | 6 ------ include/asm-m32r/m32102.h | 7 ++----- 9 files changed, 2 insertions(+), 57 deletions(-) diff -puN arch/m32r/kernel/setup_m32104ut.c~m32r-remove-unnecessary-icu_data_t arch/m32r/kernel/setup_m32104ut.c --- 25/arch/m32r/kernel/setup_m32104ut.c~m32r-remove-unnecessary-icu_data_t Fri Dec 9 14:57:01 2005 +++ 25-akpm/arch/m32r/kernel/setup_m32104ut.c Fri Dec 9 14:57:01 2005 @@ -20,12 +20,6 @@ #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) -#ifndef CONFIG_SMP -typedef struct { - unsigned long icucr; /* ICU Control Register */ -} icu_data_t; -#endif /* CONFIG_SMP */ - icu_data_t icu_data[NR_IRQS]; static void disable_m32104ut_irq(unsigned int irq) diff -puN arch/m32r/kernel/setup_m32700ut.c~m32r-remove-unnecessary-icu_data_t arch/m32r/kernel/setup_m32700ut.c --- 25/arch/m32r/kernel/setup_m32700ut.c~m32r-remove-unnecessary-icu_data_t Fri Dec 9 14:57:01 2005 +++ 25-akpm/arch/m32r/kernel/setup_m32700ut.c Fri Dec 9 14:57:01 2005 @@ -26,15 +26,7 @@ */ #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) -#ifndef CONFIG_SMP -typedef struct { - unsigned long icucr; /* ICU Control Register */ -} icu_data_t; -static icu_data_t icu_data[M32700UT_NUM_CPU_IRQ]; -#else icu_data_t icu_data[M32700UT_NUM_CPU_IRQ]; -#endif /* CONFIG_SMP */ - static void disable_m32700ut_irq(unsigned int irq) { diff -puN arch/m32r/kernel/setup_mappi2.c~m32r-remove-unnecessary-icu_data_t arch/m32r/kernel/setup_mappi2.c --- 25/arch/m32r/kernel/setup_mappi2.c~m32r-remove-unnecessary-icu_data_t Fri Dec 9 14:57:01 2005 +++ 25-akpm/arch/m32r/kernel/setup_mappi2.c Fri Dec 9 14:57:01 2005 @@ -19,12 +19,6 @@ #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) -#ifndef CONFIG_SMP -typedef struct { - unsigned long icucr; /* ICU Control Register */ -} icu_data_t; -#endif /* CONFIG_SMP */ - icu_data_t icu_data[NR_IRQS]; static void disable_mappi2_irq(unsigned int irq) diff -puN arch/m32r/kernel/setup_mappi3.c~m32r-remove-unnecessary-icu_data_t arch/m32r/kernel/setup_mappi3.c --- 25/arch/m32r/kernel/setup_mappi3.c~m32r-remove-unnecessary-icu_data_t Fri Dec 9 14:57:01 2005 +++ 25-akpm/arch/m32r/kernel/setup_mappi3.c Fri Dec 9 14:57:01 2005 @@ -19,12 +19,6 @@ #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) -#ifndef CONFIG_SMP -typedef struct { - unsigned long icucr; /* ICU Control Register */ -} icu_data_t; -#endif /* CONFIG_SMP */ - icu_data_t icu_data[NR_IRQS]; static void disable_mappi3_irq(unsigned int irq) diff -puN arch/m32r/kernel/setup_mappi.c~m32r-remove-unnecessary-icu_data_t arch/m32r/kernel/setup_mappi.c --- 25/arch/m32r/kernel/setup_mappi.c~m32r-remove-unnecessary-icu_data_t Fri Dec 9 14:57:01 2005 +++ 25-akpm/arch/m32r/kernel/setup_mappi.c Fri Dec 9 14:57:01 2005 @@ -19,12 +19,6 @@ #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) -#ifndef CONFIG_SMP -typedef struct { - unsigned long icucr; /* ICU Control Register */ -} icu_data_t; -#endif /* CONFIG_SMP */ - icu_data_t icu_data[NR_IRQS]; static void disable_mappi_irq(unsigned int irq) diff -puN arch/m32r/kernel/setup_oaks32r.c~m32r-remove-unnecessary-icu_data_t arch/m32r/kernel/setup_oaks32r.c --- 25/arch/m32r/kernel/setup_oaks32r.c~m32r-remove-unnecessary-icu_data_t Fri Dec 9 14:57:01 2005 +++ 25-akpm/arch/m32r/kernel/setup_oaks32r.c Fri Dec 9 14:57:01 2005 @@ -18,12 +18,6 @@ #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) -#ifndef CONFIG_SMP -typedef struct { - unsigned long icucr; /* ICU Control Register */ -} icu_data_t; -#endif /* CONFIG_SMP */ - icu_data_t icu_data[NR_IRQS]; static void disable_oaks32r_irq(unsigned int irq) diff -puN arch/m32r/kernel/setup_opsput.c~m32r-remove-unnecessary-icu_data_t arch/m32r/kernel/setup_opsput.c --- 25/arch/m32r/kernel/setup_opsput.c~m32r-remove-unnecessary-icu_data_t Fri Dec 9 14:57:01 2005 +++ 25-akpm/arch/m32r/kernel/setup_opsput.c Fri Dec 9 14:57:01 2005 @@ -27,15 +27,7 @@ */ #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) -#ifndef CONFIG_SMP -typedef struct { - unsigned long icucr; /* ICU Control Register */ -} icu_data_t; -static icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ]; -#else icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ]; -#endif /* CONFIG_SMP */ - static void disable_opsput_irq(unsigned int irq) { diff -puN arch/m32r/kernel/setup_usrv.c~m32r-remove-unnecessary-icu_data_t arch/m32r/kernel/setup_usrv.c --- 25/arch/m32r/kernel/setup_usrv.c~m32r-remove-unnecessary-icu_data_t Fri Dec 9 14:57:01 2005 +++ 25-akpm/arch/m32r/kernel/setup_usrv.c Fri Dec 9 14:57:01 2005 @@ -18,12 +18,6 @@ #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) -#if !defined(CONFIG_SMP) -typedef struct { - unsigned long icucr; /* ICU Control Register */ -} icu_data_t; -#endif /* CONFIG_SMP */ - icu_data_t icu_data[M32700UT_NUM_CPU_IRQ]; static void disable_mappi_irq(unsigned int irq) diff -puN include/asm-m32r/m32102.h~m32r-remove-unnecessary-icu_data_t include/asm-m32r/m32102.h --- 25/include/asm-m32r/m32102.h~m32r-remove-unnecessary-icu_data_t Fri Dec 9 14:57:01 2005 +++ 25-akpm/include/asm-m32r/m32102.h Fri Dec 9 14:57:01 2005 @@ -302,15 +302,12 @@ #define M32R_FPGA_VERSION0_PORTL (0x30+M32R_FPGA_TOP) #define M32R_FPGA_VERSION1_PORTL (0x34+M32R_FPGA_TOP) +#endif /* CONFIG_SMP */ + #ifndef __ASSEMBLY__ -/* For NETDEV WATCHDOG */ typedef struct { unsigned long icucr; /* ICU Control Register */ } icu_data_t; - -extern icu_data_t icu_data[]; #endif -#endif /* CONFIG_SMP */ - #endif /* _M32102_H_ */ _