lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: at91/ohci: use gpio_is_valid to check the gpio

Browse Source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD
2011-09-19 15:32:23 +08:00
committed by Arnd Bergmann
parent 1d6dc0683d
commit 8a7a49d18b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/host/ohci-at91.c
View File

@@ -223,7 +223,7 @@ static void ohci_at91_usb_set_power(struct at91_usbh_data *pdata, int port, int
if (port < 0 || port >= 2) if (port < 0 || port >= 2)
return; return;
if (pdata->vbus_pin[port] <= 0) if (!gpio_is_valid(pdata->vbus_pin[port]))
return; return;
gpio_set_value(pdata->vbus_pin[port], !pdata->vbus_pin_inverted ^ enable); gpio_set_value(pdata->vbus_pin[port], !pdata->vbus_pin_inverted ^ enable);
@@ -234,7 +234,7 @@ static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
if (port < 0 || port >= 2) if (port < 0 || port >= 2)
return -EINVAL; return -EINVAL;
if (pdata->vbus_pin[port] <= 0) if (!gpio_is_valid(pdata->vbus_pin[port]))
return -EINVAL; return -EINVAL;
return gpio_get_value(pdata->vbus_pin[port]) ^ !pdata->vbus_pin_inverted; return gpio_get_value(pdata->vbus_pin[port]) ^ !pdata->vbus_pin_inverted;
@@ -465,7 +465,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
if (pdata) { if (pdata) {
for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) { for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
if (pdata->vbus_pin[i] <= 0) if (!gpio_is_valid(pdata->vbus_pin[i]))
continue; continue;
gpio_request(pdata->vbus_pin[i], "ohci_vbus"); gpio_request(pdata->vbus_pin[i], "ohci_vbus");
ohci_at91_usb_set_power(pdata, i, 1); ohci_at91_usb_set_power(pdata, i, 1);
@@ -474,7 +474,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) { for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
int ret; int ret;
if (pdata->overcurrent_pin[i] <= 0) if (!gpio_is_valid(pdata->overcurrent_pin[i]))
continue; continue;
gpio_request(pdata->overcurrent_pin[i], "ohci_overcurrent"); gpio_request(pdata->overcurrent_pin[i], "ohci_overcurrent");
@@ -499,14 +499,14 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
if (pdata) { if (pdata) {
for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) { for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
if (pdata->vbus_pin[i] <= 0) if (!gpio_is_valid(pdata->vbus_pin[i]))
continue; continue;
ohci_at91_usb_set_power(pdata, i, 0); ohci_at91_usb_set_power(pdata, i, 0);
gpio_free(pdata->vbus_pin[i]); gpio_free(pdata->vbus_pin[i]);
} }
for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) { for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
if (pdata->overcurrent_pin[i] <= 0) if (!gpio_is_valid(pdata->overcurrent_pin[i]))
continue; continue;
free_irq(gpio_to_irq(pdata->overcurrent_pin[i]), pdev); free_irq(gpio_to_irq(pdata->overcurrent_pin[i]), pdev);
gpio_free(pdata->overcurrent_pin[i]); gpio_free(pdata->overcurrent_pin[i]);