Skip to content

Commit

Permalink
ARM: imx: remove header file mach/irqs.h
Browse files Browse the repository at this point in the history
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: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org
  • Loading branch information
Shawn Guo committed Oct 15, 2012
1 parent 50f2de6 commit 1e66210
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 25 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-imx/avic.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <linux/of.h>
#include <asm/mach/irq.h>
#include <asm/exception.h>
#include <mach/irqs.h>

#include "common.h"
#include "hardware.h"
Expand Down
21 changes: 0 additions & 21 deletions arch/arm/mach-imx/include/mach/irqs.h

This file was deleted.

3 changes: 3 additions & 0 deletions arch/arm/mach-imx/irq-common.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
#ifndef __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
{
int (*set_priority)(unsigned char irq, unsigned char prio);
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/mach-imx/tzic.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
#include <asm/mach/irq.h>
#include <asm/exception.h>

#include <mach/irqs.h>

#include "common.h"
#include "hardware.h"
#include "irq-common.h"
Expand Down
2 changes: 2 additions & 0 deletions include/linux/platform_data/asoc-imx-ssi.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@ struct imx_ssi_platform_data {
void (*ac97_warm_reset)(struct snd_ac97 *ac97);
};

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

#endif /* __MACH_SSI_H */

1 change: 0 additions & 1 deletion sound/soc/fsl/imx-pcm-fiq.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

#include <asm/fiq.h>

#include <mach/irqs.h>
#include <linux/platform_data/asoc-imx-ssi.h>

#include "imx-ssi.h"
Expand Down

0 comments on commit 1e66210

Please sign in to comment.