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

Commit cb5bc832 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86_64: rename irq_desc/irq_desc_alloc 



change names:

          irq_desc() ==> irq_desc_alloc
	__irq_desc() ==> irq_desc

Also split a few of the uses in lowlevel x86 code.

v2: need to check if desc is null in smp_irq_move_cleanup

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1d5f6b36

arch/x86/kernel/io_apic_64.c

+9 −1
Original line number Diff line number Diff line
@@ -1124,7 +1124,12 @@ static void ioapic_register_intr(int irq, unsigned long trigger) 
{

	struct irq_desc *desc;



	/* first time to use this irq_desc */

	if (irq < 16)

		desc = irq_to_desc(irq);

	else

		desc = irq_to_desc_alloc(irq);



	if (trigger)

		desc->status |= IRQ_LEVEL;

	else
@@ -1919,6 +1924,9 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void) 
		irq = __get_cpu_var(vector_irq)[vector];



		desc = irq_to_desc(irq);

		if (!desc)

			continue;



		cfg = irq_cfg(irq);

		spin_lock(&desc->lock);

		if (!cfg->move_cleanup_count)

arch/x86/kernel/irq_64.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int show_interrupts(struct seq_file *p, void *v) 


	if (i < nr_irqs) {

		unsigned any_count = 0;

		struct irq_desc *desc = __irq_to_desc(i);

		struct irq_desc *desc = irq_to_desc(i);



		if (!desc)

			return 0;
@@ -206,7 +206,7 @@ asmlinkage unsigned int do_IRQ(struct pt_regs *regs) 
	stack_overflow_check(regs);

#endif



	desc = __irq_to_desc(irq);

	desc = irq_to_desc(irq);

	if (likely(desc))

		generic_handle_irq_desc(irq, desc);

	else {

arch/x86/kernel/irqinit_64.c

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ void __init init_ISA_irqs(void) 
	init_8259A(0);



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

		struct irq_desc *desc = irq_to_desc(i);

		/* first time call this irq_desc */

		struct irq_desc *desc = irq_to_desc_alloc(i);



		desc->status = IRQ_DISABLED;

		desc->action = NULL;

include/linux/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ struct irq_desc { 
} ____cacheline_internodealigned_in_smp;



extern struct irq_desc *irq_to_desc(unsigned int irq);

extern struct irq_desc *__irq_to_desc(unsigned int irq);

extern struct irq_desc *irq_to_desc_alloc(unsigned int irq);



#ifndef CONFIG_HAVE_SPARSE_IRQ

kernel/irq/chip.c

+11 −10
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ void dynamic_irq_init(unsigned int irq) 
	struct irq_desc *desc;

	unsigned long flags;



	desc = irq_to_desc(irq);

	/* first time to use this irq_desc */

	desc = irq_to_desc_alloc(irq);

	if (!desc) {

		WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq);

		return;
@@ -60,7 +61,7 @@ void dynamic_irq_cleanup(unsigned int irq) 
	struct irq_desc *desc;

	unsigned long flags;



	desc = __irq_to_desc(irq);

	desc = irq_to_desc(irq);

	if (!desc) {

		WARN(1, KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq);

		return;
@@ -92,7 +93,7 @@ int set_irq_chip(unsigned int irq, struct irq_chip *chip) 
	struct irq_desc *desc;

	unsigned long flags;



	desc = __irq_to_desc(irq);

	desc = irq_to_desc(irq);

	if (!desc) {

		WARN(1, KERN_ERR "Trying to install chip for IRQ%d\n", irq);

		return -EINVAL;
@@ -122,7 +123,7 @@ int set_irq_type(unsigned int irq, unsigned int type) 
	unsigned long flags;

	int ret = -ENXIO;



	desc = __irq_to_desc(irq);

	desc = irq_to_desc(irq);

	if (!desc) {

		printk(KERN_ERR "Trying to set irq type for IRQ%d\n", irq);

		return -ENODEV;
@@ -150,7 +151,7 @@ int set_irq_data(unsigned int irq, void *data) 
	struct irq_desc *desc;

	unsigned long flags;



	desc = __irq_to_desc(irq);

	desc = irq_to_desc(irq);

	if (!desc) {

		printk(KERN_ERR

		       "Trying to install controller data for IRQ%d\n", irq);
@@ -176,7 +177,7 @@ int set_irq_msi(unsigned int irq, struct msi_desc *entry) 
	struct irq_desc *desc;

	unsigned long flags;



	desc = __irq_to_desc(irq);

	desc = irq_to_desc(irq);

	if (!desc) {

		printk(KERN_ERR

		       "Trying to install msi data for IRQ%d\n", irq);
@@ -203,7 +204,7 @@ int set_irq_chip_data(unsigned int irq, void *data) 
	struct irq_desc *desc;

	unsigned long flags;



	desc = __irq_to_desc(irq);

	desc = irq_to_desc(irq);

	if (!desc) {

		printk(KERN_ERR

		       "Trying to install chip data for IRQ%d\n", irq);
@@ -554,7 +555,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained, 
	struct irq_desc *desc;

	unsigned long flags;



	desc = __irq_to_desc(irq);

	desc = irq_to_desc(irq);

	if (!desc) {

		printk(KERN_ERR

		       "Trying to install type control for IRQ%d\n", irq);
@@ -618,7 +619,7 @@ void __init set_irq_noprobe(unsigned int irq) 
	struct irq_desc *desc;

	unsigned long flags;



	desc = __irq_to_desc(irq);

	desc = irq_to_desc(irq);

	if (!desc) {

		printk(KERN_ERR "Trying to mark IRQ%d non-probeable\n", irq);
@@ -635,7 +636,7 @@ void __init set_irq_probe(unsigned int irq) 
	struct irq_desc *desc;

	unsigned long flags;



	desc = __irq_to_desc(irq);

	desc = irq_to_desc(irq);

	if (!desc) {

		printk(KERN_ERR "Trying to mark IRQ%d probeable\n", irq);