Commit 12174aac authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

h8300: Convert to new irq_chip functions 



No functional change, just straight forward conversion.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Paul Mundt <lethal@linux-sh.org>
parent 2b1caf6e

arch/h8300/kernel/irq.c

+16 −17
Original line number Diff line number Diff line
@@ -38,34 +38,34 @@ static inline int is_ext_irq(unsigned int irq) 
	return (irq >= EXT_IRQ0 && irq <= (EXT_IRQ0 + EXT_IRQS));

}



static void h8300_enable_irq(unsigned int irq)

static void h8300_enable_irq(struct irq_data *data)

{

	if (is_ext_irq(irq))

		IER_REGS |= 1 << (irq - EXT_IRQ0);

	if (is_ext_irq(data->irq))

		IER_REGS |= 1 << (data->irq - EXT_IRQ0);

}



static void h8300_disable_irq(unsigned int irq)

static void h8300_disable_irq(struct irq_data *data)

{

	if (is_ext_irq(irq))

		IER_REGS &= ~(1 << (irq - EXT_IRQ0));

	if (is_ext_irq(data->irq))

		IER_REGS &= ~(1 << (data->irq - EXT_IRQ0));

}



static void h8300_end_irq(unsigned int irq)

{

}



static unsigned int h8300_startup_irq(unsigned int irq)

static unsigned int h8300_startup_irq(struct irq_data *data)

{

	if (is_ext_irq(irq))

		return h8300_enable_irq_pin(irq);

	if (is_ext_irq(data->irq))

		return h8300_enable_irq_pin(data->irq);

	else

		return 0;

}



static void h8300_shutdown_irq(unsigned int irq)

static void h8300_shutdown_irq(struct irq_data *data)

{

	if (is_ext_irq(irq))

		h8300_disable_irq_pin(irq);

	if (is_ext_irq(data->irq))

		h8300_disable_irq_pin(data->irq);

}



/*
@@ -73,11 +73,10 @@ static void h8300_shutdown_irq(unsigned int irq) 
 */

struct irq_chip h8300irq_chip = {

	.name		= "H8300-INTC",

	.startup	= h8300_startup_irq,

	.shutdown	= h8300_shutdown_irq,

	.enable		= h8300_enable_irq,

	.disable	= h8300_disable_irq,

	.ack		= NULL,

	.irq_startup	= h8300_startup_irq,

	.irq_shutdown	= h8300_shutdown_irq,

	.irq_enable	= h8300_enable_irq,

	.irq_disable	= h8300_disable_irq,

	.end		= h8300_end_irq,

};