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

ia64: iosapic: Cleanup irq_desc access 



Use irq_to_desc() and use accessors for setting chip and handler.

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

arch/ia64/kernel/iosapic.c

+15 −17
Original line number Original line Diff line number Diff line
@@ -566,8 +566,7 @@ static int 
register_intr (unsigned int gsi, int irq, unsigned char delivery,

register_intr (unsigned int gsi, int irq, unsigned char delivery,

	       unsigned long polarity, unsigned long trigger)

	       unsigned long polarity, unsigned long trigger)

{

{

	struct irq_desc *idesc;

	struct irq_chip *chip, *irq_type;

	struct irq_chip *irq_type;

	int index;

	int index;

	struct iosapic_rte_info *rte;

	struct iosapic_rte_info *rte;
@@ -614,19 +613,18 @@ register_intr (unsigned int gsi, int irq, unsigned char delivery, 




	irq_type = iosapic_get_irq_chip(trigger);

	irq_type = iosapic_get_irq_chip(trigger);





	idesc = irq_desc + irq;

	chip = irq_get_chip(irq);

	if (irq_type != NULL && idesc->chip != irq_type) {

	if (irq_type != NULL && chip != irq_type) {

		if (idesc->chip != &no_irq_chip)

		if (chip != &no_irq_chip)

			printk(KERN_WARNING

			printk(KERN_WARNING

			       "%s: changing vector %d from %s to %s\n",

			       "%s: changing vector %d from %s to %s\n",

			       __func__, irq_to_vector(irq),

			       __func__, irq_to_vector(irq),

			       idesc->chip->name, irq_type->name);

			       chip->name, irq_type->name);

		idesc->chip = irq_type;

		chip = irq_type;

	}

	}

	if (trigger == IOSAPIC_EDGE)

	__irq_set_chip_handler_name_locked(irq, chip, trigger == IOSAPIC_EDGE ?

		__set_irq_handler_unlocked(irq, handle_edge_irq);

					   handle_edge_irq : handle_level_irq,

	else

					   NULL);

		__set_irq_handler_unlocked(irq, handle_level_irq);

	return 0;

	return 0;

}

}
@@ -736,6 +734,7 @@ iosapic_register_intr (unsigned int gsi, 
	struct iosapic_rte_info *rte;

	struct iosapic_rte_info *rte;

	u32 low32;

	u32 low32;

	unsigned char dmode;

	unsigned char dmode;

	struct irq_desc *desc;





	/*

	/*

	 * If this GSI has already been registered (i.e., it's a

	 * If this GSI has already been registered (i.e., it's a
@@ -763,12 +762,13 @@ iosapic_register_intr (unsigned int gsi, 
			goto unlock_iosapic_lock;

			goto unlock_iosapic_lock;

	}

	}





	raw_spin_lock(&irq_desc[irq].lock);

	desc = irq_to_desc(irq);

	raw_spin_lock(&desc->lock);

	dest = get_target_cpu(gsi, irq);

	dest = get_target_cpu(gsi, irq);

	dmode = choose_dmode();

	dmode = choose_dmode();

	err = register_intr(gsi, irq, dmode, polarity, trigger);

	err = register_intr(gsi, irq, dmode, polarity, trigger);

	if (err < 0) {

	if (err < 0) {

		raw_spin_unlock(&irq_desc[irq].lock);

		raw_spin_unlock(&desc->lock);

		irq = err;

		irq = err;

		goto unlock_iosapic_lock;

		goto unlock_iosapic_lock;

	}

	}
@@ -787,7 +787,7 @@ iosapic_register_intr (unsigned int gsi, 
	       (polarity == IOSAPIC_POL_HIGH ? "high" : "low"),

	       (polarity == IOSAPIC_POL_HIGH ? "high" : "low"),

	       cpu_logical_id(dest), dest, irq_to_vector(irq));

	       cpu_logical_id(dest), dest, irq_to_vector(irq));





	raw_spin_unlock(&irq_desc[irq].lock);

	raw_spin_unlock(&desc->lock);

 unlock_iosapic_lock:

 unlock_iosapic_lock:

	spin_unlock_irqrestore(&iosapic_lock, flags);

	spin_unlock_irqrestore(&iosapic_lock, flags);

	return irq;

	return irq;
@@ -798,7 +798,6 @@ iosapic_unregister_intr (unsigned int gsi) 
{

{

	unsigned long flags;

	unsigned long flags;

	int irq, index;

	int irq, index;

	struct irq_desc *idesc;

	u32 low32;

	u32 low32;

	unsigned long trigger, polarity;

	unsigned long trigger, polarity;

	unsigned int dest;

	unsigned int dest;
@@ -828,7 +827,6 @@ iosapic_unregister_intr (unsigned int gsi) 
	if (--rte->refcnt > 0)

	if (--rte->refcnt > 0)

		goto out;

		goto out;





	idesc = irq_desc + irq;

	rte->refcnt = NO_REF_RTE;

	rte->refcnt = NO_REF_RTE;





	/* Mask the interrupt */

	/* Mask the interrupt */
@@ -852,7 +850,7 @@ iosapic_unregister_intr (unsigned int gsi) 
	if (iosapic_intr_info[irq].count == 0) {

	if (iosapic_intr_info[irq].count == 0) {

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

		/* Clear affinity */

		/* Clear affinity */

		cpumask_setall(idesc->affinity);

		cpumask_setall(irq_get_irq_data(irq)->affinity);

#endif

#endif

		/* Clear the interrupt information */

		/* Clear the interrupt information */

		iosapic_intr_info[irq].dest = 0;

		iosapic_intr_info[irq].dest = 0;