1 files changed, 11 insertions, 10 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index a4bb0da9c88c..9fc5e69213de 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -27,7 +27,8 @@ void dynamic_irq_init(unsigned int irq)
         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 @@ void dynamic_irq_cleanup(unsigned int irq)
         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 @@ int set_irq_chip(unsigned int irq, struct irq_chip *chip)
         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 @@ int set_irq_type(unsigned int irq, unsigned int type)
         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 @@ int set_irq_data(unsigned int irq, void *data)
         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 @@ int set_irq_msi(unsigned int irq, struct msi_desc *entry)
         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 @@ int set_irq_chip_data(unsigned int irq, void *data)
         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 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
         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 @@ void __init set_irq_noprobe(unsigned int irq)
         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 @@ void __init set_irq_probe(unsigned int irq)
         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);