From 3581e56fd33b87ef485140c246d0db6c43fe4c58 Mon Sep 17 00:00:00 2001 From: Pankaj Dubey Date: Fri, 14 Feb 2014 07:25:05 +0900 Subject: [PATCH 1/2] clocksource: exynos_mct: remove unwanted header file inclusion remove unwanted header file inclusion "asm/mach/time.h" from exynos_mct.c Signed-off-by: Pankaj Dubey Signed-off-by: Kukjin Kim --- drivers/clocksource/exynos_mct.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c index 48f76bc05da0..ed49b25fa552 100644 --- a/drivers/clocksource/exynos_mct.c +++ b/drivers/clocksource/exynos_mct.c @@ -25,8 +25,6 @@ #include #include -#include - #define EXYNOS4_MCTREG(x) (x) #define EXYNOS4_MCT_G_CNT_L EXYNOS4_MCTREG(0x100) #define EXYNOS4_MCT_G_CNT_U EXYNOS4_MCTREG(0x104) From a83784859ccde07ebdc3a7acfbb2f74cb6c75a80 Mon Sep 17 00:00:00 2001 From: Pankaj Dubey Date: Fri, 14 Feb 2014 07:27:40 +0900 Subject: [PATCH 2/2] irqchip: exynos-combiner: call handle_bad_irq directly This patch is inspired from following commit aec00956 (irqchip: gic: Call handle_bad_irq() directly) Also this will help in removing unwanted inclusion of header file "asm/mach/irq.h" Signed-off-by: Pankaj Dubey Reviewed-by: Tomasz Figa Signed-off-by: Kukjin Kim --- drivers/irqchip/exynos-combiner.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c index 40e6440348ff..f8636a650cf6 100644 --- a/drivers/irqchip/exynos-combiner.c +++ b/drivers/irqchip/exynos-combiner.c @@ -17,7 +17,6 @@ #include #include #include -#include #include "irqchip.h" @@ -81,7 +80,7 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) cascade_irq = irq_find_mapping(combiner_irq_domain, combiner_irq); if (unlikely(!cascade_irq)) - do_bad_IRQ(irq, desc); + handle_bad_irq(irq, desc); else generic_handle_irq(cascade_irq);