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

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

genirq: Remove dynamic_irq mess 



No more users. Get rid of the cruft.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGrant Likely <grant.likely@linaro.org>
Tested-by: default avatarTony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20140507154341.012847637@linutronix.de


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

include/linux/irq.h

+0 −10
Original line number Diff line number Diff line
@@ -525,16 +525,6 @@ static inline void irq_set_percpu_devid_flags(unsigned int irq) 
			     IRQ_NOPROBE | IRQ_PER_CPU_DEVID);

}



/*

 * Dynamic irq helper functions. Obsolete. Use irq_alloc_desc* and

 * irq_free_desc instead.

 */

extern void dynamic_irq_cleanup(unsigned int irq);

static inline void dynamic_irq_init(unsigned int irq)

{

	dynamic_irq_cleanup(irq);

}



/* Set/get chip/data for an IRQ: */

extern int irq_set_chip(unsigned int irq, struct irq_chip *chip);

extern int irq_set_handler_data(unsigned int irq, void *data);

kernel/irq/irqdesc.c

+7 −16
Original line number Diff line number Diff line
@@ -278,7 +278,12 @@ EXPORT_SYMBOL(irq_to_desc); 


static void free_desc(unsigned int irq)

{

	dynamic_irq_cleanup(irq);

	struct irq_desc *desc = irq_to_desc(irq);

	unsigned long flags;



	raw_spin_lock_irqsave(&desc->lock, flags);

	desc_set_defaults(irq, desc, desc_node(desc), NULL);

	raw_spin_unlock_irqrestore(&desc->lock, flags);

}



static inline int alloc_descs(unsigned int start, unsigned int cnt, int node,
@@ -309,7 +314,7 @@ void irq_mark_irq(unsigned int irq) 
#ifdef CONFIG_GENERIC_IRQ_LEGACY

void irq_init_desc(unsigned int irq)

{

	dynamic_irq_cleanup(irq);

	free_desc(irq);

}

#endif
@@ -522,20 +527,6 @@ int irq_set_percpu_devid(unsigned int irq) 
	return 0;

}



/**

 * dynamic_irq_cleanup - cleanup a dynamically allocated irq

 * @irq:	irq number to initialize

 */

void dynamic_irq_cleanup(unsigned int irq)

{

	struct irq_desc *desc = irq_to_desc(irq);

	unsigned long flags;



	raw_spin_lock_irqsave(&desc->lock, flags);

	desc_set_defaults(irq, desc, desc_node(desc), NULL);

	raw_spin_unlock_irqrestore(&desc->lock, flags);

}



void kstat_incr_irq_this_cpu(unsigned int irq)

{

	kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));