Skip to contentSkip to conversation

langwell_gpio: Fix deprecated refs to irq_desc->chip and chip->eoi

PATCH In review David Miller 2 participants 4 messages Jan 26, 2011 – Jan 30, 2011 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 langwell_gpio: Fix deprecated refs to irq_desc->chip and chip->eoi

---
 drivers/gpio/langwell_gpio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/gpio/langwell_gpio.c +1 -1
index d81cc74..a0d0c7b 100644
@@ -206,7 +206,7 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc)
 		/* clear the edge detect status bit */
 		writel(gedr_v, gedr);
 	}
-	desc->chip->eoi(irq);
+	desc->irq_data.chip->irq_eoi(&desc->irq_data);
 }
 
 static int __devinit lnw_gpio_probe(struct pci_dev *pdev,
Signature · 1 line
1.7.3.4
#1 lore raw

Another patch from Feng Tang already covers this and picked up by Andrew Morton.

[patch 04/23] langwell_gpio: modify EOI handling following change of kernel irq subsystem

Thanks,
Alek
-----Original Message-----
From: David Miller [mailto:[email protected]]
Sent: Wednesday, January 26, 2011 2:30 PM
To: [email protected]
Cc: Du, Alek; [email protected]
Subject: [PATCH] langwell_gpio: Fix deprecated refs to irq_desc->chip and chip->eoi

---
 drivers/gpio/langwell_gpio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/gpio/langwell_gpio.c +1 -1
index d81cc74..a0d0c7b 100644
@@ -206,7 +206,7 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc)
 		/* clear the edge detect status bit */
 		writel(gedr_v, gedr);
 	}
-	desc->chip->eoi(irq);
+	desc->irq_data.chip->irq_eoi(&desc->irq_data);
 }
 
 static int __devinit lnw_gpio_probe(struct pci_dev *pdev,
Signature · 1 line
1.7.3.4
#2 lore raw

From: "Du, Alek" <[email protected]>
Date: Wed, 26 Jan 2011 14:48:02 +0800

Quoted 3 lines

Another patch from Feng Tang already covers this and picked up by Andrew Morton.

[patch 04/23] langwell_gpio: modify EOI handling following change of kernel irq subsystem

Ok, thanks.

#3 lore raw

From: David Miller <[email protected]>
Date: Tue, 25 Jan 2011 22:50:34 -0800 (PST)

Quoted 8 lines

From: "Du, Alek" <[email protected]>
Date: Wed, 26 Jan 2011 14:48:02 +0800

Quoted 3 lines

Another patch from Feng Tang already covers this and picked up by Andrew Morton.

[patch 04/23] langwell_gpio: modify EOI handling following change of kernel irq subsystem

Ok, thanks.

It doesn't cover "this". Somthing like my patch is still necessary to get this driver to build:

drivers/gpio/langwell_gpio.c: In function 'lnw_irq_handler':
drivers/gpio/langwell_gpio.c:210:10: error: 'struct irq_desc' has no member named 'chip' drivers/gpio/langwell_gpio.c:211:7: error: 'struct irq_desc' has no member named 'chip'

--------------------
Subject: [PATCH] langwell_gpio: Fix deprecated refs to irq_desc->chip
From: David Miller <[email protected]>

drivers/gpio/langwell_gpio.c +2 -2
index 54d70a4..fb3e439 100644
@@ -207,8 +207,8 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc)
 		writel(gedr_v, gedr);
 	}
 
-	if (desc->chip->irq_eoi)
-		desc->chip->irq_eoi(irq_get_irq_data(irq));
+	if (desc->irq_data.chip->irq_eoi)
+		desc->irq_data.chip->irq_eoi(irq_get_irq_data(irq));
 	else
 		dev_warn(lnw->chip.dev, "missing EOI handler for irq %d\n", irq);