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

Commit 72bd198f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

m32r: Convert m32700ut lanpld irq chip 



Convert the irq chips to the new functions and use proper flow
handlers. handle_level_irq is appropriate.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Paul Mundt <lethal@linux-sh.org>
parent 63b549b6

arch/m32r/platforms/m32700ut/setup.c

+12 −20
Original line number Diff line number Diff line
@@ -166,29 +166,23 @@ static void enable_m32700ut_lanpld_irq(unsigned int irq) 
	outw(data, port);

}



static void mask_and_ack_m32700ut_lanpld(unsigned int irq)

static void mask_m32700ut_lanpld(struct irq_data *data)

{

	disable_m32700ut_lanpld_irq(irq);

	disable_m32700ut_lanpld_irq(data->irq);

}



static void end_m32700ut_lanpld_irq(unsigned int irq)

static void unmask_m32700ut_lanpld(struct irq_data *data)

{

	enable_m32700ut_lanpld_irq(irq);

	enable_m32700ut_lanpld_irq(data->irq);

	enable_m32700ut_irq(M32R_IRQ_INT0);

}



static unsigned int startup_m32700ut_lanpld_irq(unsigned int irq)

{

	enable_m32700ut_lanpld_irq(irq);

	return (0);

}



static void shutdown_m32700ut_lanpld_irq(unsigned int irq)

static void shutdown_m32700ut_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);

}
@@ -196,12 +190,9 @@ static void shutdown_m32700ut_lanpld_irq(unsigned int irq) 
static struct irq_chip m32700ut_lanpld_irq_type =

{

	.name		= "M32700UT-PLD-LAN-IRQ",

	.startup = startup_m32700ut_lanpld_irq,

	.shutdown = shutdown_m32700ut_lanpld_irq,

	.enable = enable_m32700ut_lanpld_irq,

	.disable = disable_m32700ut_lanpld_irq,

	.ack = mask_and_ack_m32700ut_lanpld,

	.end = end_m32700ut_lanpld_irq

	.irq_shutdown	= shutdown_m32700ut_lanpld,

	.irq_mask	= mask_m32700ut_lanpld,

	.irq_unmask	= unmask_m32700ut_lanpld,

};



/*
@@ -277,7 +268,8 @@ void __init init_IRQ(void) 
{

#if defined(CONFIG_SMC91X)

	/* INT#0: LAN controller on M32700UT-LAN (SMC91C111)*/

	set_irq_chip(M32700UT_LAN_IRQ_LAN, &m32700ut_lanpld_irq_type);

	set_irq_chip_and_handler(M32700UT_LAN_IRQ_LAN,

				 &m32700ut_lanpld_irq_type, handle_level_irq);

	lanpld_icu_data[irq2lanpldirq(M32700UT_LAN_IRQ_LAN)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02;	/* "H" edge sense */

	disable_m32700ut_lanpld_irq(M32700UT_LAN_IRQ_LAN);

#endif  /* CONFIG_SMC91X */