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: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index a4bb0da..9fc5e69 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -27,7 +27,8 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index e1d787e..d44e351 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -151,7 +151,7 @@
struct irq_desc *sparse_irqs;
DEFINE_DYN_ARRAY(sparse_irqs, sizeof(struct irq_desc), nr_irq_desc, PAGE_SIZE, init_work);
-struct irq_desc *__irq_to_desc(unsigned int irq)
+struct irq_desc *irq_to_desc(unsigned int irq)
{
struct irq_desc *desc;
@@ -169,7 +169,7 @@
}
return NULL;
}
-struct irq_desc *irq_to_desc(unsigned int irq)
+struct irq_desc *irq_to_desc_alloc(unsigned int irq)
{
struct irq_desc *desc, *desc_pri;
int i;
@@ -186,6 +186,7 @@
if (desc->irq == -1U) {
desc->irq = irq;
+ printk(KERN_DEBUG "found new irq_desc for irq %d\n", desc->irq);
return desc;
}
desc_pri = desc;
@@ -236,21 +237,7 @@
desc->irq = irq;
desc_pri->next = desc;
- {
- /* double check if some one mess up the list */
- struct irq_desc *desc;
- int count = 0;
-
- desc = &sparse_irqs[0];
- while (desc) {
- printk(KERN_DEBUG "1 found irq_desc for irq %d\n", desc->irq);
- if (desc->next)
- printk(KERN_DEBUG "1 found irq_desc for irq %d and next will be irq %d\n", desc->irq, desc->next->irq);
- desc = desc->next;
- count++;
- }
- printk(KERN_DEBUG "1 all preallocted %d\n", count);
- }
+ printk(KERN_DEBUG "1 found new irq_desc for irq %d and pri will be irq %d\n", desc->irq, desc_pri->irq);
return desc;
}
@@ -285,7 +272,7 @@
return NULL;
}
-struct irq_desc *__irq_to_desc(unsigned int irq)
+struct irq_desc *irq_to_desc_alloc(unsigned int irq)
{
return irq_to_desc(irq);
}
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index c0b4d4d..6df4921 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -31,7 +31,7 @@
*/
void synchronize_irq(unsigned int irq)
{
- struct irq_desc *desc = __irq_to_desc(irq);
+ struct irq_desc *desc = irq_to_desc(irq);
unsigned int status;
if (!desc)
@@ -145,7 +145,7 @@
struct irq_desc *desc;
unsigned long flags;
- desc = __irq_to_desc(irq);
+ desc = irq_to_desc(irq);
if (!desc)
return;
@@ -174,7 +174,7 @@
{
struct irq_desc *desc;
- desc = __irq_to_desc(irq);
+ desc = irq_to_desc(irq);
if (!desc)
return;
@@ -218,7 +218,7 @@
struct irq_desc *desc;
unsigned long flags;
- desc = __irq_to_desc(irq);
+ desc = irq_to_desc(irq);
if (!desc)
return;
@@ -296,7 +296,7 @@
struct irq_desc *desc;
struct irqaction *action;
- desc = __irq_to_desc(irq);
+ desc = irq_to_desc(irq);
if (!desc)
return 0;
@@ -366,7 +366,7 @@
int shared = 0;
int ret;
- desc = __irq_to_desc(irq);
+ desc = irq_to_desc(irq);
if (!desc)
return -EINVAL;
@@ -527,7 +527,7 @@
WARN_ON(in_interrupt());
- desc = __irq_to_desc(irq);
+ desc = irq_to_desc(irq);
if (!desc)
return;
@@ -644,7 +644,7 @@
if ((irqflags & IRQF_SHARED) && !dev_id)
return -EINVAL;
- desc = __irq_to_desc(irq);
+ desc = irq_to_desc(irq);
if (!desc)
return -EINVAL;
