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

Commit 230f9846 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: remove disable_fiq and arch_ret_to_user macros 



Now that most platforms don't need disable_fiq and arch_ret_to_user
macros, we can remove the empty macros or empty entry-macro.S files.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarJamie Iles <jamie@jamieiles.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarRyan Mallon <rmallon@gmail.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 243c8654

arch/arm/include/asm/hardware/entry-macro-iomd.S

+0 −8
Original line number Diff line number Diff line
@@ -11,14 +11,6 @@ 
/* IOC / IOMD based hardware */

#include <asm/hardware/iomd.h>



		.macro	disable_fiq

		mov	r12, #ioc_base_high

		.if	ioc_base_low

		orr	r12, r12, #ioc_base_low

		.endif

		strb	r12, [r12, #0x38]	@ Disable FIQ register

		.endm



		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

		ldrb	\irqstat, [\base, #IOMD_IRQREQB]	@ get high priority first

		ldr	\tmp, =irq_prio_h

arch/arm/mach-at91/include/mach/entry-macro.S

+0 −6
Original line number Diff line number Diff line
@@ -13,17 +13,11 @@ 
#include <mach/hardware.h>

#include <mach/at91_aic.h>



	.macro	disable_fiq

	.endm



	.macro  get_irqnr_preamble, base, tmp

	ldr	\base, =at91_aic_base		@ base virtual address of AIC peripheral

	ldr	\base, [\base]

	.endm



	.macro  arch_ret_to_user, tmp1, tmp2

	.endm



	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

	ldr	\irqnr, [\base, #AT91_AIC_IVR]		@ read IRQ vector register: de-asserts nIRQ to processor (and clears interrupt)

	ldr	\irqstat, [\base, #AT91_AIC_ISR]	@ read interrupt source number

arch/arm/mach-bcmring/include/mach/entry-macro.S

+0 −6
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
#include <mach/hardware.h>

#include <mach/csp/mm_io.h>



		.macro	disable_fiq

		.endm



		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

		ldr	\base, =(MM_IO_BASE_INTC0)

		ldr	\irqstat, [\base, #0]		@ get status
@@ -77,6 +74,3 @@ 


		.macro  get_irqnr_preamble, base, tmp

		.endm
 


		.macro  arch_ret_to_user, tmp1, tmp2

		.endm

arch/arm/mach-clps711x/include/mach/entry-macro.S

+0 −6
Original line number Diff line number Diff line
@@ -10,15 +10,9 @@ 
#include <mach/hardware.h>

#include <asm/hardware/clps7111.h>



		.macro	disable_fiq

		.endm



		.macro	get_irqnr_preamble, base, tmp

		.endm



		.macro	arch_ret_to_user, tmp1, tmp2

		.endm



#if (INTSR2 - INTSR1) != (INTMR2 - INTMR1)

#error INTSR stride != INTMR stride

#endif

arch/arm/mach-cns3xxx/include/mach/entry-macro.S

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
/*

 * Low-level IRQ helper macros for Cavium Networks platforms

 *

 * Copyright 2008 Cavium Networks

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as

 * published by the Free Software Foundation.

 */



		.macro	disable_fiq

		.endm



		.macro  arch_ret_to_user, tmp1, tmp2

		.endm