Skip to content

Commit

Permalink
MIPS: EMMA2RH: Remove emma2rh_sw_irq_base
Browse files Browse the repository at this point in the history
Let's use immediate value, instead.  This also saves memory footprint,
and probably a little bit faster.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Shinya Kuribayashi authored and Ralf Baechle committed Oct 27, 2008
1 parent 9b6c04b commit 68ed1ca
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
4 changes: 2 additions & 2 deletions arch/mips/emma/markeins/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
*
*/

extern void emma2rh_sw_irq_init(u32 base);
extern void emma2rh_sw_irq_init(void);
extern void emma2rh_gpio_irq_init(u32 base);
extern void emma2rh_irq_init(void);
extern void emma2rh_irq_dispatch(void);
Expand Down Expand Up @@ -103,7 +103,7 @@ void __init arch_init_irq(void)

/* init all controllers */
emma2rh_irq_init();
emma2rh_sw_irq_init(EMMA2RH_SW_IRQ_BASE);
emma2rh_sw_irq_init();
emma2rh_gpio_irq_init(EMMA2RH_GPIO_IRQ_BASE);
mips_cpu_irq_init();

Expand Down
14 changes: 6 additions & 8 deletions arch/mips/emma/markeins/irq_markeins.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include <asm/debug.h>
#include <asm/emma/emma2rh.h>

static int emma2rh_sw_irq_base = -1;
static int emma2rh_gpio_irq_base = -1;

void ll_emma2rh_sw_irq_enable(int reg);
Expand All @@ -40,12 +39,12 @@ void ll_emma2rh_gpio_irq_disable(int reg);

static void emma2rh_sw_irq_enable(unsigned int irq)
{
ll_emma2rh_sw_irq_enable(irq - emma2rh_sw_irq_base);
ll_emma2rh_sw_irq_enable(irq - EMMA2RH_SW_IRQ_BASE);
}

static void emma2rh_sw_irq_disable(unsigned int irq)
{
ll_emma2rh_sw_irq_disable(irq - emma2rh_sw_irq_base);
ll_emma2rh_sw_irq_disable(irq - EMMA2RH_SW_IRQ_BASE);
}

struct irq_chip emma2rh_sw_irq_controller = {
Expand All @@ -56,15 +55,14 @@ struct irq_chip emma2rh_sw_irq_controller = {
.unmask = emma2rh_sw_irq_enable,
};

void emma2rh_sw_irq_init(u32 irq_base)
void emma2rh_sw_irq_init(void)
{
u32 i;

for (i = irq_base; i < irq_base + NUM_EMMA2RH_IRQ_SW; i++)
set_irq_chip_and_handler(i, &emma2rh_sw_irq_controller,
for (i = 0; i < NUM_EMMA2RH_IRQ_SW; i++)
set_irq_chip_and_handler(EMMA2RH_SW_IRQ_BASE + i,
&emma2rh_sw_irq_controller,
handle_level_irq);

emma2rh_sw_irq_base = irq_base;
}

void ll_emma2rh_sw_irq_enable(int irq)
Expand Down

0 comments on commit 68ed1ca

Please sign in to comment.