From deed7f70233b6e5b20a3fd72ec4ef099a99db6f2 Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Fri, 31 Oct 2008 14:18:53 +0200 Subject: [PATCH] Switch brf6150 and hci_h4p to use gpio_request/free calls Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren --- drivers/bluetooth/brf6150.c | 26 +++++++++++++------------- drivers/bluetooth/hci_h4p/core.c | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/bluetooth/brf6150.c b/drivers/bluetooth/brf6150.c index 256ecdec505..2d22aec1a52 100644 --- a/drivers/bluetooth/brf6150.c +++ b/drivers/bluetooth/brf6150.c @@ -33,9 +33,9 @@ #include #include #include +#include #include -#include #include #include @@ -913,7 +913,7 @@ static int __init brf6150_init(void) NBT_DBG("Uart: %d\n", info->btinfo->bt_uart); NBT_DBG("sysclk: %d\n", info->btinfo->bt_sysclk); - err = omap_request_gpio(info->btinfo->reset_gpio); + err = gpio_request(info->btinfo->reset_gpio, "BT reset"); if (err < 0) { printk(KERN_WARNING "Cannot get GPIO line %d", @@ -922,23 +922,23 @@ static int __init brf6150_init(void) return err; } - err = omap_request_gpio(info->btinfo->bt_wakeup_gpio); + err = gpio_request(info->btinfo->bt_wakeup_gpio, "BT wakeup"); if (err < 0) { printk(KERN_WARNING "Cannot get GPIO line 0x%d", info->btinfo->bt_wakeup_gpio); - omap_free_gpio(info->btinfo->reset_gpio); + gpio_free(info->btinfo->reset_gpio); kfree(info); return err; } - err = omap_request_gpio(info->btinfo->host_wakeup_gpio); + err = gpio_request(info->btinfo->host_wakeup_gpio, "BT host wakeup"); if (err < 0) { printk(KERN_WARNING "Cannot get GPIO line %d", info->btinfo->host_wakeup_gpio); - omap_free_gpio(info->btinfo->reset_gpio); - omap_free_gpio(info->btinfo->bt_wakeup_gpio); + gpio_free(info->btinfo->reset_gpio); + gpio_free(info->btinfo->bt_wakeup_gpio); kfree(info); return err; } @@ -1022,9 +1022,9 @@ cleanup_irq: free_irq(irq, (void *)info); free_irq(gpio_to_irq(info->btinfo->host_wakeup_gpio), (void *)info); cleanup: - omap_free_gpio(info->btinfo->reset_gpio); - omap_free_gpio(info->btinfo->bt_wakeup_gpio); - omap_free_gpio(info->btinfo->host_wakeup_gpio); + gpio_free(info->btinfo->reset_gpio); + gpio_free(info->btinfo->bt_wakeup_gpio); + gpio_free(info->btinfo->host_wakeup_gpio); kfree(info); return err; @@ -1034,9 +1034,9 @@ static void __exit brf6150_exit(void) { brf6150_hci_close(exit_info->hdev); hci_free_dev(exit_info->hdev); - omap_free_gpio(exit_info->btinfo->reset_gpio); - omap_free_gpio(exit_info->btinfo->bt_wakeup_gpio); - omap_free_gpio(exit_info->btinfo->host_wakeup_gpio); + gpio_free(exit_info->btinfo->reset_gpio); + gpio_free(exit_info->btinfo->bt_wakeup_gpio); + gpio_free(exit_info->btinfo->host_wakeup_gpio); free_irq(exit_info->irq, (void *)exit_info); free_irq(gpio_to_irq(exit_info->btinfo->host_wakeup_gpio), (void *)exit_info); kfree(exit_info); diff --git a/drivers/bluetooth/hci_h4p/core.c b/drivers/bluetooth/hci_h4p/core.c index 9964a0c24a2..a5b76ad9bdb 100644 --- a/drivers/bluetooth/hci_h4p/core.c +++ b/drivers/bluetooth/hci_h4p/core.c @@ -34,9 +34,9 @@ #include #include #include +#include #include -#include #include #include #include @@ -823,7 +823,7 @@ static int hci_h4p_probe(struct platform_device *pdev) NBT_DBG("Uart: %d\n", bt_config->bt_uart); NBT_DBG("sysclk: %d\n", info->bt_sysclk); - err = omap_request_gpio(info->reset_gpio); + err = gpio_request(info->reset_gpio, "BT reset"); if (err < 0) { dev_err(&pdev->dev, "Cannot get GPIO line %d\n", info->reset_gpio); @@ -831,23 +831,23 @@ static int hci_h4p_probe(struct platform_device *pdev) goto cleanup; } - err = omap_request_gpio(info->bt_wakeup_gpio); + err = gpio_request(info->bt_wakeup_gpio, "BT wakeup"); if (err < 0) { dev_err(info->dev, "Cannot get GPIO line 0x%d", info->bt_wakeup_gpio); - omap_free_gpio(info->reset_gpio); + gpio_free(info->reset_gpio); kfree(info); goto cleanup; } - err = omap_request_gpio(info->host_wakeup_gpio); + err = gpio_request(info->host_wakeup_gpio, "BT host wakeup"); if (err < 0) { dev_err(info->dev, "Cannot get GPIO line %d", info->host_wakeup_gpio); - omap_free_gpio(info->reset_gpio); - omap_free_gpio(info->bt_wakeup_gpio); + gpio_free(info->reset_gpio); + gpio_free(info->bt_wakeup_gpio); kfree(info); goto cleanup; } @@ -953,9 +953,9 @@ cleanup_irq: free_irq(gpio_to_irq(info->host_wakeup_gpio), (void *)info); cleanup: gpio_set_value(info->reset_gpio, 0); - omap_free_gpio(info->reset_gpio); - omap_free_gpio(info->bt_wakeup_gpio); - omap_free_gpio(info->host_wakeup_gpio); + gpio_free(info->reset_gpio); + gpio_free(info->bt_wakeup_gpio); + gpio_free(info->host_wakeup_gpio); kfree(info); return err; @@ -971,9 +971,9 @@ static int hci_h4p_remove(struct platform_device *dev) hci_h4p_hci_close(info->hdev); free_irq(gpio_to_irq(info->host_wakeup_gpio), (void *) info); hci_free_dev(info->hdev); - omap_free_gpio(info->reset_gpio); - omap_free_gpio(info->bt_wakeup_gpio); - omap_free_gpio(info->host_wakeup_gpio); + gpio_free(info->reset_gpio); + gpio_free(info->bt_wakeup_gpio); + gpio_free(info->host_wakeup_gpio); free_irq(info->irq, (void *) info); kfree(info); -- 2.41.0