Commit ec775d0e authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

powerpc: Convert to new irq_* function names 



Scripted with coccinelle.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7bfbc1f2

arch/powerpc/kernel/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ unsigned int irq_create_of_mapping(struct device_node *controller, 
	/* Set type if specified and different than the current one */

	if (type != IRQ_TYPE_NONE &&

	    type != (irqd_get_trigger_type(irq_get_irq_data(virq))))

		set_irq_type(virq, type);

		irq_set_irq_type(virq, type);

	return virq;

}

EXPORT_SYMBOL_GPL(irq_create_of_mapping);
@@ -853,7 +853,7 @@ void irq_dispose_mapping(unsigned int virq) 
		return;



	/* remove chip and handler */

	set_irq_chip_and_handler(virq, NULL, NULL);

	irq_set_chip_and_handler(virq, NULL, NULL);



	/* Make sure it's completed */

	synchronize_irq(virq);
@@ -1158,7 +1158,7 @@ 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));



			chip = get_irq_desc_chip(desc);

			chip = irq_desc_get_chip(desc);

			if (chip && chip->name)

				p = chip->name;

			else

arch/powerpc/kernel/machine_kexec.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ void machine_kexec_mask_interrupts(void) { 
		if (!desc)

			continue;



		chip = get_irq_desc_chip(desc);

		chip = irq_desc_get_chip(desc);

		if (!chip)

			continue;

arch/powerpc/kernel/pci-common.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev) 


		virq = irq_create_mapping(NULL, line);

		if (virq != NO_IRQ)

			set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);

			irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);

	} else {

		pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",

			 oirq.size, oirq.specifier[0], oirq.specifier[1],

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

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ cpld_pic_host_map(struct irq_host *h, unsigned int virq, 
			     irq_hw_number_t hw)

{

	irq_set_status_flags(virq, IRQ_LEVEL);

	set_irq_chip_and_handler(virq, &cpld_pic, handle_level_irq);

	irq_set_chip_and_handler(virq, &cpld_pic, handle_level_irq);

	return 0;

}
@@ -198,7 +198,7 @@ mpc5121_ads_cpld_pic_init(void) 
		goto end;

	}



	set_irq_chained_handler(cascade_irq, cpld_pic_cascade);

	irq_set_chained_handler(cascade_irq, cpld_pic_cascade);

end:

	of_node_put(np);

}

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

+5 −5
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static struct irq_chip media5200_irq_chip = { 


void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)

{

	struct irq_chip *chip = get_irq_desc_chip(desc);

	struct irq_chip *chip = irq_desc_get_chip(desc);

	int sub_virq, val;

	u32 status, enable;
@@ -116,8 +116,8 @@ static int media5200_irq_map(struct irq_host *h, unsigned int virq, 
			     irq_hw_number_t hw)

{

	pr_debug("%s: h=%p, virq=%i, hwirq=%i\n", __func__, h, virq, (int)hw);

	set_irq_chip_data(virq, &media5200_irq);

	set_irq_chip_and_handler(virq, &media5200_irq_chip, handle_level_irq);

	irq_set_chip_data(virq, &media5200_irq);

	irq_set_chip_and_handler(virq, &media5200_irq_chip, handle_level_irq);

	irq_set_status_flags(virq, IRQ_LEVEL);

	return 0;

}
@@ -182,8 +182,8 @@ static void __init media5200_init_irq(void) 


	media5200_irq.irqhost->host_data = &media5200_irq;



	set_irq_data(cascade_virq, &media5200_irq);

	set_irq_chained_handler(cascade_virq, media5200_irq_cascade);

	irq_set_handler_data(cascade_virq, &media5200_irq);

	irq_set_chained_handler(cascade_virq, media5200_irq_cascade);



	return;