Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 687fb3c8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-drivers' of... 

Merge tag 'samsung-drivers' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

Samsung drivers update for v3.15 from Kukjin Kim:
- remove inclusion <asm/mach/time.h> from exynos_mct.c
- remove inclusion <asm/mach/irq.h> from exynos-combiner.c
  and use calling handle_bad_irq() instead of do_bad_IRQ()

* tag 'samsung-drivers' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  irqchip: exynos-combiner: call handle_bad_irq directly
  clocksource: exynos_mct: remove unwanted header file inclusion

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents cf460cde a8378485

drivers/clocksource/exynos_mct.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/clocksource.h>

#include <linux/clocksource.h>





#include <asm/mach/time.h>



#define EXYNOS4_MCTREG(x)		(x)

#define EXYNOS4_MCTREG(x)		(x)

#define EXYNOS4_MCT_G_CNT_L		EXYNOS4_MCTREG(0x100)

#define EXYNOS4_MCT_G_CNT_L		EXYNOS4_MCTREG(0x100)

#define EXYNOS4_MCT_G_CNT_U		EXYNOS4_MCTREG(0x104)

#define EXYNOS4_MCT_G_CNT_U		EXYNOS4_MCTREG(0x104)

drivers/irqchip/exynos-combiner.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/irqchip/chained_irq.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_irq.h>

#include <asm/mach/irq.h>





#include "irqchip.h"

#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);

	cascade_irq = irq_find_mapping(combiner_irq_domain, combiner_irq);





	if (unlikely(!cascade_irq))

	if (unlikely(!cascade_irq))

		do_bad_IRQ(irq, desc);

		handle_bad_irq(irq, desc);

	else

	else

		generic_handle_irq(cascade_irq);

		generic_handle_irq(cascade_irq);