Commit 79ff1cda authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

genirq: Remove irq argument from __enable/__disable_irq() 



Solely used for debug output. Can be retrieved from irq descriptor if
necessary.

[ tglx: Split out from combo patch ]

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a1ff541a

kernel/irq/internals.h

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ enum { 
#include "settings.h"



extern int __irq_set_trigger(struct irq_desc *desc, unsigned long flags);

extern void __disable_irq(struct irq_desc *desc, unsigned int irq);

extern void __enable_irq(struct irq_desc *desc, unsigned int irq);

extern void __disable_irq(struct irq_desc *desc);

extern void __enable_irq(struct irq_desc *desc);



extern int irq_startup(struct irq_desc *desc, bool resend);

extern void irq_shutdown(struct irq_desc *desc);

kernel/irq/manage.c

+7 −6
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) 
}

#endif



void __disable_irq(struct irq_desc *desc, unsigned int irq)

void __disable_irq(struct irq_desc *desc)

{

	if (!desc->depth++)

		irq_disable(desc);
@@ -436,7 +436,7 @@ static int __disable_irq_nosync(unsigned int irq) 


	if (!desc)

		return -EINVAL;

	__disable_irq(desc, irq);

	__disable_irq(desc);

	irq_put_desc_busunlock(desc, flags);

	return 0;

}
@@ -503,12 +503,13 @@ bool disable_hardirq(unsigned int irq) 
}

EXPORT_SYMBOL_GPL(disable_hardirq);



void __enable_irq(struct irq_desc *desc, unsigned int irq)

void __enable_irq(struct irq_desc *desc)

{

	switch (desc->depth) {

	case 0:

 err_out:

		WARN(1, KERN_WARNING "Unbalanced enable for IRQ %d\n", irq);

		WARN(1, KERN_WARNING "Unbalanced enable for IRQ %d\n",

		     irq_desc_get_irq(desc));

		break;

	case 1: {

		if (desc->istate & IRQS_SUSPENDED)
@@ -546,7 +547,7 @@ void enable_irq(unsigned int irq) 
		 KERN_ERR "enable_irq before setup/request_irq: irq %u\n", irq))

		goto out;



	__enable_irq(desc, irq);

	__enable_irq(desc);

out:

	irq_put_desc_busunlock(desc, flags);

}
@@ -1280,7 +1281,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
	 */

	if (shared && (desc->istate & IRQS_SPURIOUS_DISABLED)) {

		desc->istate &= ~IRQS_SPURIOUS_DISABLED;

		__enable_irq(desc, irq);

		__enable_irq(desc);

	}



	raw_spin_unlock_irqrestore(&desc->lock, flags);

kernel/irq/pm.c

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static bool suspend_device_irq(struct irq_desc *desc, int irq) 
	}



	desc->istate |= IRQS_SUSPENDED;

	__disable_irq(desc, irq);

	__disable_irq(desc);



	/*

	 * Hardware which has no wakeup source configuration facility
@@ -150,7 +150,7 @@ static void resume_irq(struct irq_desc *desc, int irq) 
	desc->depth++;

resume:

	desc->istate &= ~IRQS_SUSPENDED;

	__enable_irq(desc, irq);

	__enable_irq(desc);

}



static void resume_irqs(bool want_early)