public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bluetooth: hci_bcm: Replace spinlock by mutex

Browse source 
Replace spinlock by mutex to be able to use bcm_device_lock in
sleepable context like devm_request_threaded_irq or upcomming PM support.

Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Frederic Danis 2015-09-01 12:13:35 +02:00 • committed by Marcel Holtmann
parent f81b001a3e
commit bb3ea16a44
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/bluetooth/hci_bcm.c
View file

@ -66,7 +66,7 @@ struct bcm_data {
}; };
/* List of BCM BT UART devices */ /* List of BCM BT UART devices */
static DEFINE_SPINLOCK(bcm_device_lock); static DEFINE_MUTEX(bcm_device_lock);
static LIST_HEAD(bcm_device_list); static LIST_HEAD(bcm_device_list);
static int bcm_set_baudrate(struct hci_uart *hu, unsigned int speed) static int bcm_set_baudrate(struct hci_uart *hu, unsigned int speed)
@ -164,7 +164,7 @@ static int bcm_open(struct hci_uart *hu)
hu->priv = bcm; hu->priv = bcm;
spin_lock(&bcm_device_lock); mutex_lock(&bcm_device_lock);
list_for_each(p, &bcm_device_list) { list_for_each(p, &bcm_device_list) {
struct bcm_device *dev = list_entry(p, struct bcm_device, list); struct bcm_device *dev = list_entry(p, struct bcm_device, list);
@ -185,7 +185,7 @@ static int bcm_open(struct hci_uart *hu)
if (bcm->dev) if (bcm->dev)
bcm_gpio_set_power(bcm->dev, true); bcm_gpio_set_power(bcm->dev, true);
spin_unlock(&bcm_device_lock); mutex_unlock(&bcm_device_lock);
return 0; return 0;
} }
@ -197,14 +197,14 @@ static int bcm_close(struct hci_uart *hu)
BT_DBG("hu %p", hu); BT_DBG("hu %p", hu);
/* Protect bcm->dev against removal of the device or driver */ /* Protect bcm->dev against removal of the device or driver */
spin_lock(&bcm_device_lock); mutex_lock(&bcm_device_lock);
if (bcm_device_exists(bcm->dev)) { if (bcm_device_exists(bcm->dev)) {
bcm_gpio_set_power(bcm->dev, false); bcm_gpio_set_power(bcm->dev, false);
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
bcm->dev->hu = NULL; bcm->dev->hu = NULL;
#endif #endif
} }
spin_unlock(&bcm_device_lock); mutex_unlock(&bcm_device_lock);
skb_queue_purge(&bcm->txq); skb_queue_purge(&bcm->txq);
kfree_skb(bcm->rx_skb); kfree_skb(bcm->rx_skb);
@ -338,7 +338,7 @@ static int bcm_suspend(struct device *dev)
BT_DBG("suspend (%p): is_suspended %d", bdev, bdev->is_suspended); BT_DBG("suspend (%p): is_suspended %d", bdev, bdev->is_suspended);
spin_lock(&bcm_device_lock); mutex_lock(&bcm_device_lock);
if (!bdev->hu) if (!bdev->hu)
goto unlock; goto unlock;
@ -358,7 +358,7 @@ static int bcm_suspend(struct device *dev)
} }
unlock: unlock:
spin_unlock(&bcm_device_lock); mutex_unlock(&bcm_device_lock);
return 0; return 0;
} }
@ -370,7 +370,7 @@ static int bcm_resume(struct device *dev)
BT_DBG("resume (%p): is_suspended %d", bdev, bdev->is_suspended); BT_DBG("resume (%p): is_suspended %d", bdev, bdev->is_suspended);
spin_lock(&bcm_device_lock); mutex_lock(&bcm_device_lock);
if (!bdev->hu) if (!bdev->hu)
goto unlock; goto unlock;
@ -389,7 +389,7 @@ static int bcm_resume(struct device *dev)
} }
unlock: unlock:
spin_unlock(&bcm_device_lock); mutex_unlock(&bcm_device_lock);
return 0; return 0;
} }
@ -504,9 +504,9 @@ static int bcm_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "%s device registered.\n", dev->name); dev_info(&pdev->dev, "%s device registered.\n", dev->name);
/* Place this instance on the device list */ /* Place this instance on the device list */
spin_lock(&bcm_device_lock); mutex_lock(&bcm_device_lock);
list_add_tail(&dev->list, &bcm_device_list); list_add_tail(&dev->list, &bcm_device_list);
spin_unlock(&bcm_device_lock); mutex_unlock(&bcm_device_lock);
bcm_gpio_set_power(dev, false); bcm_gpio_set_power(dev, false);
@ -517,9 +517,9 @@ static int bcm_remove(struct platform_device *pdev)
{ {
struct bcm_device *dev = platform_get_drvdata(pdev); struct bcm_device *dev = platform_get_drvdata(pdev);
spin_lock(&bcm_device_lock); mutex_lock(&bcm_device_lock);
list_del(&dev->list); list_del(&dev->list);
spin_unlock(&bcm_device_lock); mutex_unlock(&bcm_device_lock);
acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pdev->dev)); acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pdev->dev));