AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: pxa: Use gpio arrays in vpac270_pcmcia driver

Browse Source 
Use gpio_request_array() / gpio_free_array(), this makes the code
cleaner and less error prone.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
This commit is contained in:
Marek Vasut 2011-01-15 19:11:16 +01:00 committed by Eric Miao
parent 235a175c40
commit e27af7edda
1 changed files with 29 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
drivers/pcmcia/pxa2xx_vpac270.c
View File

@ -22,6 +22,19 @@
#include "soc_common.h" #include "soc_common.h"
static struct gpio vpac270_pcmcia_gpios[] = {
{ GPIO84_VPAC270_PCMCIA_CD, GPIOF_IN, "PCMCIA Card Detect" },
{ GPIO35_VPAC270_PCMCIA_RDY, GPIOF_IN, "PCMCIA Ready" },
{ GPIO107_VPAC270_PCMCIA_PPEN, GPIOF_INIT_LOW, "PCMCIA PPEN" },
{ GPIO11_VPAC270_PCMCIA_RESET, GPIOF_INIT_LOW, "PCMCIA Reset" },
};
static struct gpio vpac270_cf_gpios[] = {
{ GPIO17_VPAC270_CF_CD, GPIOF_IN, "CF Card Detect" },
{ GPIO12_VPAC270_CF_RDY, GPIOF_IN, "CF Ready" },
{ GPIO16_VPAC270_CF_RESET, GPIOF_INIT_LOW, "CF Reset" },
};
static struct pcmcia_irqs cd_irqs[] = { static struct pcmcia_irqs cd_irqs[] = {
{ {
.sock = 0, .sock = 0,
@ -40,96 +53,34 @@ static int vpac270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
int ret; int ret;
if (skt->nr == 0) { if (skt->nr == 0) {
ret = gpio_request(GPIO84_VPAC270_PCMCIA_CD, "PCMCIA CD"); ret = gpio_request_array(vpac270_pcmcia_gpios,
if (ret) ARRAY_SIZE(vpac270_pcmcia_gpios));
goto err1;
ret = gpio_direction_input(GPIO84_VPAC270_PCMCIA_CD);
if (ret)
goto err2;
ret = gpio_request(GPIO35_VPAC270_PCMCIA_RDY, "PCMCIA RDY");
if (ret)
goto err2;
ret = gpio_direction_input(GPIO35_VPAC270_PCMCIA_RDY);
if (ret)
goto err3;
ret = gpio_request(GPIO107_VPAC270_PCMCIA_PPEN, "PCMCIA PPEN");
if (ret)
goto err3;
ret = gpio_direction_output(GPIO107_VPAC270_PCMCIA_PPEN, 0);
if (ret)
goto err4;
ret = gpio_request(GPIO11_VPAC270_PCMCIA_RESET, "PCMCIA RESET");
if (ret)
goto err4;
ret = gpio_direction_output(GPIO11_VPAC270_PCMCIA_RESET, 0);
if (ret)
goto err5;
skt->socket.pci_irq = gpio_to_irq(GPIO35_VPAC270_PCMCIA_RDY); skt->socket.pci_irq = gpio_to_irq(GPIO35_VPAC270_PCMCIA_RDY);
return soc_pcmcia_request_irqs(skt, &cd_irqs[0], 1); if (!ret)
ret = soc_pcmcia_request_irqs(skt, &cd_irqs[0], 1);
err5:
gpio_free(GPIO11_VPAC270_PCMCIA_RESET);
err4:
gpio_free(GPIO107_VPAC270_PCMCIA_PPEN);
err3:
gpio_free(GPIO35_VPAC270_PCMCIA_RDY);
err2:
gpio_free(GPIO84_VPAC270_PCMCIA_CD);
err1:
return ret;
} else { } else {
ret = gpio_request(GPIO17_VPAC270_CF_CD, "CF CD"); ret = gpio_request_array(vpac270_cf_gpios,
if (ret) ARRAY_SIZE(vpac270_cf_gpios));
goto err6;
ret = gpio_direction_input(GPIO17_VPAC270_CF_CD);
if (ret)
goto err7;
ret = gpio_request(GPIO12_VPAC270_CF_RDY, "CF RDY");
if (ret)
goto err7;
ret = gpio_direction_input(GPIO12_VPAC270_CF_RDY);
if (ret)
goto err8;
ret = gpio_request(GPIO16_VPAC270_CF_RESET, "CF RESET");
if (ret)
goto err8;
ret = gpio_direction_output(GPIO16_VPAC270_CF_RESET, 0);
if (ret)
goto err9;
skt->socket.pci_irq = gpio_to_irq(GPIO12_VPAC270_CF_RDY); skt->socket.pci_irq = gpio_to_irq(GPIO12_VPAC270_CF_RDY);
return soc_pcmcia_request_irqs(skt, &cd_irqs[1], 1); if (!ret)
ret = soc_pcmcia_request_irqs(skt, &cd_irqs[1], 1);
err9:
gpio_free(GPIO16_VPAC270_CF_RESET);
err8:
gpio_free(GPIO12_VPAC270_CF_RDY);
err7:
gpio_free(GPIO17_VPAC270_CF_CD);
err6:
return ret;
} }
return ret;
} }
static void vpac270_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) static void vpac270_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
{ {
gpio_free(GPIO11_VPAC270_PCMCIA_RESET); if (skt->nr == 0)
gpio_free(GPIO107_VPAC270_PCMCIA_PPEN); gpio_request_array(vpac270_pcmcia_gpios,
gpio_free(GPIO35_VPAC270_PCMCIA_RDY); ARRAY_SIZE(vpac270_pcmcia_gpios));
gpio_free(GPIO84_VPAC270_PCMCIA_CD); else
gpio_free(GPIO16_VPAC270_CF_RESET); gpio_request_array(vpac270_cf_gpios,
gpio_free(GPIO12_VPAC270_CF_RDY); ARRAY_SIZE(vpac270_cf_gpios));
gpio_free(GPIO17_VPAC270_CF_CD);
} }
static void vpac270_pcmcia_socket_state(struct soc_pcmcia_socket *skt, static void vpac270_pcmcia_socket_state(struct soc_pcmcia_socket *skt,