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

Commit b27df672 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Benjamin Herrenschmidt
Browse files

powerpc: Fixup last users of irq_chip->typename 



The typename member of struct irq_chip was kept for migration purposes
and is obsolete since more than 2 years. Fix up the leftovers.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
Acked-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 293cfa44

arch/powerpc/kernel/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ int show_interrupts(struct seq_file *p, void *v) 
#endif /* CONFIG_SMP */



	if (desc->chip)

		seq_printf(p, " %s ", desc->chip->typename);

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

	else

		seq_puts(p, "  None      ");
@@ -1112,8 +1112,8 @@ static int virq_debug_show(struct seq_file *m, void *private) 
			seq_printf(m, "%5d  ", i);

			seq_printf(m, "0x%05lx  ", virq_to_hw(i));



			if (desc->chip && desc->chip->typename)

				p = desc->chip->typename;

			if (desc->chip && desc->chip->name)

				p = desc->chip->name;

			else

				p = none;

			seq_printf(m, "%-15s  ", p);

arch/powerpc/platforms/512x/mpc5121_ads_cpld.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ cpld_unmask_irq(unsigned int irq) 
}



static struct irq_chip cpld_pic = {

	.typename = " CPLD PIC ",

	.name = " CPLD PIC ",

	.mask = cpld_mask_irq,

	.ack = cpld_mask_irq,

	.unmask = cpld_unmask_irq,

arch/powerpc/platforms/52xx/media5200.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void media5200_irq_mask(unsigned int virq) 
}



static struct irq_chip media5200_irq_chip = {

	.typename = "Media5200 FPGA",

	.name = "Media5200 FPGA",

	.unmask = media5200_irq_unmask,

	.mask = media5200_irq_mask,

	.mask_ack = media5200_irq_mask,

arch/powerpc/platforms/52xx/mpc52xx_gpt.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int mpc52xx_gpt_irq_set_type(unsigned int virq, unsigned int flow_type) 
}



static struct irq_chip mpc52xx_gpt_irq_chip = {

	.typename = "MPC52xx GPT",

	.name = "MPC52xx GPT",

	.unmask = mpc52xx_gpt_irq_unmask,

	.mask = mpc52xx_gpt_irq_mask,

	.ack = mpc52xx_gpt_irq_ack,

arch/powerpc/platforms/52xx/mpc52xx_pic.c

+4 −4
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static int mpc52xx_extirq_set_type(unsigned int virq, unsigned int flow_type) 
}



static struct irq_chip mpc52xx_extirq_irqchip = {

	.typename = "MPC52xx External",

	.name = "MPC52xx External",

	.mask = mpc52xx_extirq_mask,

	.unmask = mpc52xx_extirq_unmask,

	.ack = mpc52xx_extirq_ack,
@@ -258,7 +258,7 @@ static void mpc52xx_main_unmask(unsigned int virq) 
}



static struct irq_chip mpc52xx_main_irqchip = {

	.typename = "MPC52xx Main",

	.name = "MPC52xx Main",

	.mask = mpc52xx_main_mask,

	.mask_ack = mpc52xx_main_mask,

	.unmask = mpc52xx_main_unmask,
@@ -291,7 +291,7 @@ static void mpc52xx_periph_unmask(unsigned int virq) 
}



static struct irq_chip mpc52xx_periph_irqchip = {

	.typename = "MPC52xx Peripherals",

	.name = "MPC52xx Peripherals",

	.mask = mpc52xx_periph_mask,

	.mask_ack = mpc52xx_periph_mask,

	.unmask = mpc52xx_periph_unmask,
@@ -335,7 +335,7 @@ static void mpc52xx_sdma_ack(unsigned int virq) 
}



static struct irq_chip mpc52xx_sdma_irqchip = {

	.typename = "MPC52xx SDMA",

	.name = "MPC52xx SDMA",

	.mask = mpc52xx_sdma_mask,

	.unmask = mpc52xx_sdma_unmask,

	.ack = mpc52xx_sdma_ack,