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

Commit 1e66210a authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: remove header file mach/irqs.h 



The only mach/irqs.h user outside arch/arm/mach-imx is
sound/soc/fsl/imx-pcm-fiq.c, which refers to mxc_set_irq_fiq().
Move the declaration into include/linux/platform_data/asoc-imx-ssi.h,
so that we can remove mach/irqs.h includsion from imx-pcm-fiq.c.

Inside arch/arm/mach-imx, the only users to mach/irqs.h are avic.c
and tzic.c for referring to macro FIQ_START.  Let's move the macro
into irq-common.h and get rid of mach/irqs.h completely.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org
parent 50f2de61

arch/arm/mach-imx/avic.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/of.h>

#include <linux/of.h>

#include <asm/mach/irq.h>

#include <asm/mach/irq.h>

#include <asm/exception.h>

#include <asm/exception.h>

#include <mach/irqs.h>





#include "common.h"

#include "common.h"

#include "hardware.h"

#include "hardware.h"

arch/arm/mach-imx/include/mach/irqs.h

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

 *  Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.

 */



/*

 * This program 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.

 */



#ifndef __ASM_ARCH_MXC_IRQS_H__

#define __ASM_ARCH_MXC_IRQS_H__



extern int imx_irq_set_priority(unsigned char irq, unsigned char prio);



/* all normal IRQs can be FIQs */

#define FIQ_START	0

/* switch between IRQ and FIQ */

extern int mxc_set_irq_fiq(unsigned int irq, unsigned int type);



#endif /* __ASM_ARCH_MXC_IRQS_H__ */

arch/arm/mach-imx/irq-common.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,9 @@ 
#ifndef __PLAT_MXC_IRQ_COMMON_H__

#ifndef __PLAT_MXC_IRQ_COMMON_H__

#define __PLAT_MXC_IRQ_COMMON_H__

#define __PLAT_MXC_IRQ_COMMON_H__





/* all normal IRQs can be FIQs */

#define FIQ_START	0



struct mxc_extra_irq

struct mxc_extra_irq

{

{

	int (*set_priority)(unsigned char irq, unsigned char prio);

	int (*set_priority)(unsigned char irq, unsigned char prio);

arch/arm/mach-imx/tzic.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include <asm/mach/irq.h>

#include <asm/mach/irq.h>

#include <asm/exception.h>

#include <asm/exception.h>





#include <mach/irqs.h>



#include "common.h"

#include "common.h"

#include "hardware.h"

#include "hardware.h"

#include "irq-common.h"

#include "irq-common.h"

include/linux/platform_data/asoc-imx-ssi.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -17,5 +17,7 @@ struct imx_ssi_platform_data { 
	void (*ac97_warm_reset)(struct snd_ac97 *ac97);

	void (*ac97_warm_reset)(struct snd_ac97 *ac97);

};

};





extern int mxc_set_irq_fiq(unsigned int irq, unsigned int type);



#endif /* __MACH_SSI_H */

#endif /* __MACH_SSI_H */