mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR arm: omap2: mux: fix compile warning omap1: Simplify use of omap_irq_flags omap2+: Fix unused variable warning for omap_irq_base
This commit is contained in:
commit
35a8524ffe
6 changed files with 5 additions and 34 deletions
|
@ -14,19 +14,6 @@
|
|||
#include <mach/irqs.h>
|
||||
#include <asm/hardware/gic.h>
|
||||
|
||||
/*
|
||||
* We use __glue to avoid errors with multiple definitions of
|
||||
* .globl omap_irq_flags as it's included from entry-armv.S but not
|
||||
* from entry-common.S.
|
||||
*/
|
||||
#ifdef __glue
|
||||
.pushsection .data
|
||||
.globl omap_irq_flags
|
||||
omap_irq_flags:
|
||||
.word 0
|
||||
.popsection
|
||||
#endif
|
||||
|
||||
.macro disable_fiq
|
||||
.endm
|
||||
|
||||
|
|
|
@ -57,6 +57,7 @@ struct omap_irq_bank {
|
|||
unsigned long wake_enable;
|
||||
};
|
||||
|
||||
u32 omap_irq_flags;
|
||||
static unsigned int irq_bank_count;
|
||||
static struct omap_irq_bank *irq_banks;
|
||||
|
||||
|
@ -176,7 +177,6 @@ static struct irq_chip omap_irq_chip = {
|
|||
|
||||
void __init omap_init_irq(void)
|
||||
{
|
||||
extern unsigned int omap_irq_flags;
|
||||
int i, j;
|
||||
|
||||
#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
|
||||
|
|
|
@ -264,7 +264,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
|
|||
if (IS_ERR(od)) {
|
||||
pr_err("%s: Cant build omap_device for %s:%s.\n",
|
||||
__func__, name, oh->name);
|
||||
return IS_ERR(od);
|
||||
return PTR_ERR(od);
|
||||
}
|
||||
|
||||
mem = platform_get_resource(&od->pdev, IORESOURCE_MEM, 0);
|
||||
|
|
|
@ -38,20 +38,6 @@
|
|||
*/
|
||||
|
||||
#ifdef MULTI_OMAP2
|
||||
|
||||
/*
|
||||
* We use __glue to avoid errors with multiple definitions of
|
||||
* .globl omap_irq_base as it's included from entry-armv.S but not
|
||||
* from entry-common.S.
|
||||
*/
|
||||
#ifdef __glue
|
||||
.pushsection .data
|
||||
.globl omap_irq_base
|
||||
omap_irq_base:
|
||||
.word 0
|
||||
.popsection
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Configure the interrupt base on the first interrupt.
|
||||
* See also omap_irq_base_init for setting omap_irq_base.
|
||||
|
|
|
@ -314,14 +314,13 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data)
|
|||
return omap_hwmod_set_postsetup_state(oh, *(u8 *)data);
|
||||
}
|
||||
|
||||
void __iomem *omap_irq_base;
|
||||
|
||||
/*
|
||||
* Initialize asm_irq_base for entry-macro.S
|
||||
*/
|
||||
static inline void omap_irq_base_init(void)
|
||||
{
|
||||
extern void __iomem *omap_irq_base;
|
||||
|
||||
#ifdef MULTI_OMAP2
|
||||
if (cpu_is_omap24xx())
|
||||
omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE);
|
||||
else if (cpu_is_omap34xx())
|
||||
|
@ -330,7 +329,6 @@ static inline void omap_irq_base_init(void)
|
|||
omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE);
|
||||
else
|
||||
pr_err("Could not initialize omap_irq_base\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
void __init omap2_init_common_infrastructure(void)
|
||||
|
|
|
@ -160,7 +160,7 @@ static int __init _omap_mux_get_by_name(struct omap_mux_partition *partition,
|
|||
struct omap_mux *mux = NULL;
|
||||
struct omap_mux_entry *e;
|
||||
const char *mode_name;
|
||||
int found = 0, found_mode, mode0_len = 0;
|
||||
int found = 0, found_mode = 0, mode0_len = 0;
|
||||
struct list_head *muxmodes = &partition->muxmodes;
|
||||
|
||||
mode_name = strchr(muxname, '.');
|
||||
|
|
Loading…
Reference in a new issue