m32r: Convert opsput lanpld irq chip
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Hirokazu Takata <takata@linux-m32r.org> Cc: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
22cbc9384a
commit
1899a493b9
|
@ -167,42 +167,33 @@ static void enable_opsput_lanpld_irq(unsigned int irq)
|
|||
outw(data, port);
|
||||
}
|
||||
|
||||
static void mask_and_ack_opsput_lanpld(unsigned int irq)
|
||||
static void mask_opsput_lanpld(struct irq_data *data)
|
||||
{
|
||||
disable_opsput_lanpld_irq(irq);
|
||||
disable_opsput_lanpld_irq(data->irq);
|
||||
}
|
||||
|
||||
static void end_opsput_lanpld_irq(unsigned int irq)
|
||||
static void unmask_opsput_lanpld(struct irq_data *data)
|
||||
{
|
||||
enable_opsput_lanpld_irq(irq);
|
||||
enable_opsput_lanpld_irq(data->irq);
|
||||
enable_opsput_irq(M32R_IRQ_INT0);
|
||||
}
|
||||
|
||||
static unsigned int startup_opsput_lanpld_irq(unsigned int irq)
|
||||
{
|
||||
enable_opsput_lanpld_irq(irq);
|
||||
return (0);
|
||||
}
|
||||
|
||||
static void shutdown_opsput_lanpld_irq(unsigned int irq)
|
||||
static void shutdown_opsput_lanpld(struct irq_data *data)
|
||||
{
|
||||
unsigned long port;
|
||||
unsigned int pldirq;
|
||||
|
||||
pldirq = irq2lanpldirq(irq);
|
||||
pldirq = irq2lanpldirq(data->irq);
|
||||
port = lanpldirq2port(pldirq);
|
||||
outw(PLD_ICUCR_ILEVEL7, port);
|
||||
}
|
||||
|
||||
static struct irq_chip opsput_lanpld_irq_type =
|
||||
{
|
||||
.name = "OPSPUT-PLD-LAN-IRQ",
|
||||
.startup = startup_opsput_lanpld_irq,
|
||||
.shutdown = shutdown_opsput_lanpld_irq,
|
||||
.enable = enable_opsput_lanpld_irq,
|
||||
.disable = disable_opsput_lanpld_irq,
|
||||
.ack = mask_and_ack_opsput_lanpld,
|
||||
.end = end_opsput_lanpld_irq
|
||||
.name = "OPSPUT-PLD-LAN-IRQ",
|
||||
.irq_shutdown = shutdown_opsput_lanpld,
|
||||
.irq_mask = mask_opsput_lanpld,
|
||||
.irq_unmask = unmask_opsput_lanpld,
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -278,7 +269,8 @@ void __init init_IRQ(void)
|
|||
{
|
||||
#if defined(CONFIG_SMC91X)
|
||||
/* INT#0: LAN controller on OPSPUT-LAN (SMC91C111)*/
|
||||
set_irq_chip(OPSPUT_LAN_IRQ_LAN, &opsput_lanpld_irq_type);
|
||||
set_irq_chip_and_handler(OPSPUT_LAN_IRQ_LAN, &opsput_lanpld_irq_type,
|
||||
handle_level_irq);
|
||||
lanpld_icu_data[irq2lanpldirq(OPSPUT_LAN_IRQ_LAN)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02; /* "H" edge sense */
|
||||
disable_opsput_lanpld_irq(OPSPUT_LAN_IRQ_LAN);
|
||||
#endif /* CONFIG_SMC91X */
|
||||
|
|
Loading…
Reference in New Issue