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

Commit a8553acd authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] genirq: cleanup: remove irq_descp() 



Cleanup: remove irq_descp() - explicit use of irq_desc[] is shorter and more
readable.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a53da52f

arch/ia64/hp/sim/hpsim_irq.c

+3 −3
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ hpsim_irq_init (void) 
	int i;



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

		idesc = irq_descp(i);

		if (idesc->handler == &no_irq_type)

			idesc->handler = &irq_type_hp_sim;

		idesc = irq_desc + i;

		if (idesc->chip == &no_irq_type)

			idesc->chip = &irq_type_hp_sim;

	}

}

arch/ia64/kernel/iosapic.c

+7 −7
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ iosapic_startup_edge_irq (unsigned int irq) 
static void

iosapic_ack_edge_irq (unsigned int irq)

{

	irq_desc_t *idesc = irq_descp(irq);

	irq_desc_t *idesc = irq_desc + irq;



	move_native_irq(irq);

	/*
@@ -659,7 +659,7 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery, 
	else

		irq_type = &irq_type_iosapic_level;



	idesc = irq_descp(vector);

	idesc = irq_desc + vector;

	if (idesc->chip != irq_type) {

		if (idesc->chip != &no_irq_type)

			printk(KERN_WARNING
@@ -793,14 +793,14 @@ iosapic_register_intr (unsigned int gsi, 
			return -ENOSPC;

	}



	spin_lock_irqsave(&irq_descp(vector)->lock, flags);

	spin_lock_irqsave(&irq_desc[vector].lock, flags);

	spin_lock(&iosapic_lock);

	{

		if (gsi_to_vector(gsi) > 0) {

			if (list_empty(&iosapic_intr_info[vector].rtes))

				free_irq_vector(vector);

			spin_unlock(&iosapic_lock);

			spin_unlock_irqrestore(&irq_descp(vector)->lock,

			spin_unlock_irqrestore(&irq_desc[vector].lock,

					       flags);

			goto again;

		}
@@ -810,7 +810,7 @@ iosapic_register_intr (unsigned int gsi, 
			      polarity, trigger);

		if (err < 0) {

			spin_unlock(&iosapic_lock);

			spin_unlock_irqrestore(&irq_descp(vector)->lock,

			spin_unlock_irqrestore(&irq_desc[vector].lock,

					       flags);

			return err;

		}
@@ -825,7 +825,7 @@ iosapic_register_intr (unsigned int gsi, 
		set_rte(gsi, vector, dest, mask);

	}

	spin_unlock(&iosapic_lock);

	spin_unlock_irqrestore(&irq_descp(vector)->lock, flags);

	spin_unlock_irqrestore(&irq_desc[vector].lock, flags);



	printk(KERN_INFO "GSI %u (%s, %s) -> CPU %d (0x%04x) vector %d\n",

	       gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"),
@@ -860,7 +860,7 @@ iosapic_unregister_intr (unsigned int gsi) 
	}

	vector = irq_to_vector(irq);



	idesc = irq_descp(irq);

	idesc = irq_desc + irq;

	spin_lock_irqsave(&idesc->lock, flags);

	spin_lock(&iosapic_lock);

	{

arch/ia64/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void migrate_irqs(void) 
	int 		irq, new_cpu;



	for (irq=0; irq < NR_IRQS; irq++) {

		desc = irq_descp(irq);

		desc = irq_desc + irq;



		/*

		 * No handling for now.

arch/ia64/kernel/irq_ia64.c

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ register_percpu_irq (ia64_vector vec, struct irqaction *action) 


	for (irq = 0; irq < NR_IRQS; ++irq)

		if (irq_to_vector(irq) == vec) {

			desc = irq_descp(irq);

			desc = irq_desc + irq;

			desc->status |= IRQ_PER_CPU;

			desc->chip = &irq_type_ia64_lsapic;

			if (action)

arch/ia64/kernel/mca.c

+1 −1
Original line number Diff line number Diff line
@@ -1788,7 +1788,7 @@ ia64_mca_late_init(void) 
			cpe_poll_enabled = 0;

			for (irq = 0; irq < NR_IRQS; ++irq)

				if (irq_to_vector(irq) == cpe_vector) {

					desc = irq_descp(irq);

					desc = irq_desc + irq;

					desc->status |= IRQ_PER_CPU;

					setup_irq(irq, &mca_cpe_irqaction);

					ia64_cpe_irq = irq;