Skip to contentSkip to conversation

pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()

PATCH Applied Axel Lin 2 participants 3 messages Dec 5, 2011 – Dec 8, 2011

Subsystems (2)
PXA2xx/PXA3xx support Pcmcia
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 1/1 pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()

Since commit 6384fd "ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ", I got buid errors due to implicit declaration of function 'IRQ_GPIO'.

Use common gpio_to_irq() to replace machine dependant macro IRQ_GPIO().

Cc Marek Vasut <[email protected]>
Cc Ian Molton <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Zhuang <[email protected]>
Cc Eric Miao <[email protected]>
Cc Russell King <[email protected]>
Signed-off-by Axel Lin <[email protected]>

---
v2:
I just found pxa2xx_trizeps4.c also needs to be converted to gpio_to_irq. Thus include the fix for pxa2xx_trizeps4.c in v2.

 drivers/pcmcia/pxa2xx_e740.c      |   11 +++++++----
 drivers/pcmcia/pxa2xx_palmld.c    |    2 +-
 drivers/pcmcia/pxa2xx_palmtc.c    |    2 +-
 drivers/pcmcia/pxa2xx_stargate2.c |    6 ++++--
 drivers/pcmcia/pxa2xx_trizeps4.c  |    5 +++--
 drivers/pcmcia/pxa2xx_vpac270.c   |    4 ++--
 6 files changed, 18 insertions(+), 12 deletions(-)
drivers/pcmcia/pxa2xx_e740.c +7 -4
index 8bfbd4d..17cd2ce 100644
@@ -26,20 +26,23 @@
 static struct pcmcia_irqs cd_irqs[] = {
 	{
 		.sock = 0,
-		.irq  = IRQ_GPIO(GPIO_E740_PCMCIA_CD0),
 		.str  = "CF card detect"
 	},
 	{
 		.sock = 1,
-		.irq  = IRQ_GPIO(GPIO_E740_PCMCIA_CD1),
 		.str  = "Wifi switch"
 	},
 };
 
 static int e740_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-	skt->socket.pci_irq = skt->nr == 0 ? IRQ_GPIO(GPIO_E740_PCMCIA_RDY0) :
-				IRQ_GPIO(GPIO_E740_PCMCIA_RDY1);
+	if (skt->nr == 0)
+		skt->socket.pci_irq = gpio_to_irq(GPIO_E740_PCMCIA_RDY0);
+	else
+		skt->socket.pci_irq = gpio_to_irq(GPIO_E740_PCMCIA_RDY1);
+
+	cd_irqs[0].irq = gpio_to_irq(GPIO_E740_PCMCIA_CD0);
+	cd_irqs[1].irq = gpio_to_irq(GPIO_E740_PCMCIA_CD1);
 
 	return soc_pcmcia_request_irqs(skt, &cd_irqs[skt->nr], 1);
 }
drivers/pcmcia/pxa2xx_palmld.c +1 -1
index d589ad1..6a8e011 100644
@@ -33,7 +33,7 @@ static int palmld_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 	ret = gpio_request_array(palmld_pcmcia_gpios,
 				ARRAY_SIZE(palmld_pcmcia_gpios));
 
-	skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY);
+	skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMLD_PCMCIA_READY);
 
 	return ret;
 }
drivers/pcmcia/pxa2xx_palmtc.c +1 -1
index 9c6a04b..9e38de7 100644
@@ -37,7 +37,7 @@ static int palmtc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 	ret = gpio_request_array(palmtc_pcmcia_gpios,
 				ARRAY_SIZE(palmtc_pcmcia_gpios));
 
-	skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMTC_PCMCIA_READY);
+	skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMTC_PCMCIA_READY);
 
 	return ret;
 }
drivers/pcmcia/pxa2xx_stargate2.c +4 -2
index 9396222..6c2366b 100644
@@ -34,7 +34,7 @@
 #define SG2_S0_GPIO_READY	81
 
 static struct pcmcia_irqs irqs[] = {
-	{ 0, IRQ_GPIO(SG2_S0_GPIO_DETECT), "PCMCIA0 CD" },
+	{.sock = 0, .str = "PCMCIA0 CD" },
 };
 
 static struct gpio sg2_pcmcia_gpios[] = {

@@ -44,7 +44,9 @@ static struct gpio sg2_pcmcia_gpios[] = {
 
 static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-	skt->socket.pci_irq = IRQ_GPIO(SG2_S0_GPIO_READY);
+	skt->socket.pci_irq = gpio_to_irq(SG2_S0_GPIO_READY);
+	irqs[0].irq = gpio_to_irq(SG2_S0_GPIO_DETECT);
+
 	return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
 }
drivers/pcmcia/pxa2xx_trizeps4.c +3 -2
index 57ddb969..7c33f89 100644
@@ -30,7 +30,7 @@
 extern void board_pcmcia_power(int power);
 
 static struct pcmcia_irqs irqs[] = {
-	{ 0, IRQ_GPIO(GPIO_PCD), "cs0_cd" }
+	{ .sock = 0, .str = "cs0_cd" }
 	/* on other baseboards we can have more inputs */
 };
 

@@ -53,7 +53,8 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 			gpio_free(GPIO_PRDY);
 			return -EINVAL;
 		}
-		skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY);
+		skt->socket.pci_irq = gpio_to_irq(GPIO_PRDY);
+		irqs[0].irq = gpio_to_irq(GPIO_PCD);
 		break;
 	default:
 		break;
drivers/pcmcia/pxa2xx_vpac270.c +2 -2
index 66ab92c..61b17d2 100644
@@ -38,12 +38,10 @@ static struct gpio vpac270_cf_gpios[] = {
 static struct pcmcia_irqs cd_irqs[] = {
 	{
 		.sock = 0,
-		.irq  = IRQ_GPIO(GPIO84_VPAC270_PCMCIA_CD),
 		.str  = "PCMCIA CD"
 	},
 	{
 		.sock = 1,
-		.irq  = IRQ_GPIO(GPIO17_VPAC270_CF_CD),
 		.str  = "CF CD"
 	},
 };

@@ -57,6 +55,7 @@ static int vpac270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 				ARRAY_SIZE(vpac270_pcmcia_gpios));
 
 		skt->socket.pci_irq = gpio_to_irq(GPIO35_VPAC270_PCMCIA_RDY);
+		cd_irqs[0].irq = gpio_to_irq(GPIO84_VPAC270_PCMCIA_CD);
 
 		if (!ret)
 			ret = soc_pcmcia_request_irqs(skt, &cd_irqs[0], 1);

@@ -65,6 +64,7 @@ static int vpac270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 				ARRAY_SIZE(vpac270_cf_gpios));
 
 		skt->socket.pci_irq = gpio_to_irq(GPIO12_VPAC270_CF_RDY);
+		cd_irqs[1].irq = gpio_to_irq(GPIO17_VPAC270_CF_CD);
 
 		if (!ret)
 			ret = soc_pcmcia_request_irqs(skt, &cd_irqs[1], 1);
Signature · 1 line
1.7.5.4
maintainer Acked-by on v2 1/1
#1 lore raw
Quoted 17 lines · Axel Lin

Since commit 6384fd "ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ", I got buid errors due to implicit declaration of function 'IRQ_GPIO'.

Use common gpio_to_irq() to replace machine dependant macro IRQ_GPIO().

Cc Marek Vasut <[email protected]>
Cc Ian Molton <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Zhuang <[email protected]>
Cc Eric Miao <[email protected]>
Cc Russell King <[email protected]>
Signed-off-by Axel Lin <[email protected]>

---
v2:
I just found pxa2xx_trizeps4.c also needs to be converted to gpio_to_irq. Thus include the fix for pxa2xx_trizeps4.c in v2.

Quoted 8 lines
?drivers/pcmcia/pxa2xx_e740.c ? ? ?| ? 11 +++++++----
?drivers/pcmcia/pxa2xx_palmld.c ? ?| ? ?2 +-
?drivers/pcmcia/pxa2xx_palmtc.c ? ?| ? ?2 +-
?drivers/pcmcia/pxa2xx_stargate2.c | ? ?6 ++++--
?drivers/pcmcia/pxa2xx_trizeps4.c ?| ? ?5 +++--
?drivers/pcmcia/pxa2xx_vpac270.c ? | ? ?4 ++--

?6 files changed, 18 insertions(+), 12 deletions(-)

Acked-by Haojian Zhuang <[email protected]>
maintainer Applied
#2 lore raw
Quoted 26 lines · Haojian Zhuang
Quoted 17 lines · Axel Lin

Since commit 6384fd "ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ", I got buid errors due to implicit declaration of function 'IRQ_GPIO'.

Use common gpio_to_irq() to replace machine dependant macro IRQ_GPIO().

Cc Marek Vasut <[email protected]>
Cc Ian Molton <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Zhuang <[email protected]>
Cc Eric Miao <[email protected]>
Cc Russell King <[email protected]>
Signed-off-by Axel Lin <[email protected]>

---
v2:
I just found pxa2xx_trizeps4.c also needs to be converted to gpio_to_irq. Thus include the fix for pxa2xx_trizeps4.c in v2.

Quoted 8 lines
?drivers/pcmcia/pxa2xx_e740.c ? ? ?| ? 11 +++++++----
?drivers/pcmcia/pxa2xx_palmld.c ? ?| ? ?2 +-
?drivers/pcmcia/pxa2xx_palmtc.c ? ?| ? ?2 +-
?drivers/pcmcia/pxa2xx_stargate2.c | ? ?6 ++++--
?drivers/pcmcia/pxa2xx_trizeps4.c ?| ? ?5 +++--
?drivers/pcmcia/pxa2xx_vpac270.c ? | ? ?4 ++--

?6 files changed, 18 insertions(+), 12 deletions(-)

Quoted 1 line
Acked-by Haojian Zhuang <[email protected]>

Applied