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

Commit 709bc44c authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Updates for irq-flow-type naming changes. 



handle_irq_name() and set_irq_chip_and_handler() disappeared,
update for desc->name and set_irq_chip_and_handler_name() use.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent c2a560f5

arch/sh/boards/renesas/r7780rp/irq.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ static void disable_r7780rp_irq(unsigned int irq) 
}

}





static struct irq_chip r7780rp_irq_chip __read_mostly = {

static struct irq_chip r7780rp_irq_chip __read_mostly = {

	.name		= "r7780rp",

	.name		= "R7780RP",

	.mask		= disable_r7780rp_irq,

	.mask		= disable_r7780rp_irq,

	.unmask		= enable_r7780rp_irq,

	.unmask		= enable_r7780rp_irq,

	.mask_ack	= disable_r7780rp_irq,

	.mask_ack	= disable_r7780rp_irq,
@@ -48,8 +48,8 @@ void __init init_r7780rp_IRQ(void) 




	for (i = 0; i < 15; i++) {

	for (i = 0; i < 15; i++) {

		disable_irq_nosync(i);

		disable_irq_nosync(i);

		set_irq_chip_and_handler(i, &r7780rp_irq_chip,

		set_irq_chip_and_handler_name(i, &r7780rp_irq_chip,

					 handle_level_irq);

					      handle_level_irq, "level");

		enable_r7780rp_irq(i);

		enable_r7780rp_irq(i);

	}

	}

}
 
}

arch/sh/kernel/cpu/irq/intc2.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ static void enable_intc2_irq(unsigned int irq) 
}

}





static struct irq_chip intc2_irq_chip = {

static struct irq_chip intc2_irq_chip = {

	.typename	= "intc2",

	.name		= "INTC2",

	.mask		= disable_intc2_irq,

	.mask		= disable_intc2_irq,

	.unmask		= enable_intc2_irq,

	.unmask		= enable_intc2_irq,

	.mask_ack	= disable_intc2_irq,

	.mask_ack	= disable_intc2_irq,
@@ -64,7 +64,8 @@ void make_intc2_irq(struct intc2_data *p) 




	local_irq_restore(flags);

	local_irq_restore(flags);





	set_irq_chip_and_handler(p->irq, &intc2_irq_chip, handle_level_irq);

	set_irq_chip_and_handler_name(p->irq, &intc2_irq_chip,

				      handle_level_irq, "level");

	set_irq_chip_data(p->irq, p);

	set_irq_chip_data(p->irq, p);





	enable_intc2_irq(p->irq);

	enable_intc2_irq(p->irq);

arch/sh/kernel/cpu/irq/ipr.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ static void enable_ipr_irq(unsigned int irq) 
}

}





static struct irq_chip ipr_irq_chip = {

static struct irq_chip ipr_irq_chip = {

	.name		= "ipr",

	.name		= "IPR",

	.mask		= disable_ipr_irq,

	.mask		= disable_ipr_irq,

	.unmask		= enable_ipr_irq,

	.unmask		= enable_ipr_irq,

	.mask_ack	= disable_ipr_irq,

	.mask_ack	= disable_ipr_irq,
@@ -60,7 +60,8 @@ void make_ipr_irq(unsigned int irq, unsigned int addr, int pos, int priority) 
	ipr_data.shift = pos*4; /* POSition (0-3) x 4 means shift */

	ipr_data.shift = pos*4; /* POSition (0-3) x 4 means shift */

	ipr_data.priority = priority;

	ipr_data.priority = priority;





	set_irq_chip_and_handler(irq, &ipr_irq_chip, handle_level_irq);

	set_irq_chip_and_handler_name(irq, &ipr_irq_chip,

				      handle_level_irq, "level");

	set_irq_chip_data(irq, &ipr_data);

	set_irq_chip_data(irq, &ipr_data);





	enable_ipr_irq(irq);

	enable_ipr_irq(irq);

arch/sh/kernel/irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ int show_interrupts(struct seq_file *p, void *v) 
		for_each_online_cpu(j)

		for_each_online_cpu(j)

			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);

			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);

		seq_printf(p, " %14s", irq_desc[i].chip->name);

		seq_printf(p, " %14s", irq_desc[i].chip->name);

		seq_printf(p, "-%s", handle_irq_name(irq_desc[i].handle_irq));

		seq_printf(p, "-%-8s", irq_desc[i].name);

		seq_printf(p, "  %s", action->name);

		seq_printf(p, "  %s", action->name);





		for (action=action->next; action; action = action->next)

		for (action=action->next; action; action = action->next)