Commit b8414ba5 authored by Sakari Ailus's avatar Sakari Ailus Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: Remove redundant pm_runtime_mark_last_busy() calls 



pm_runtime_put_autosuspend(), pm_runtime_put_sync_autosuspend(),
pm_runtime_autosuspend() and pm_request_autosuspend() now include a call
to pm_runtime_mark_last_busy(). Remove the now-reduntant explicit call to
pm_runtime_mark_last_busy().

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 73d2d709

drivers/bluetooth/btmtksdio.c

+0 −1
Original line number Diff line number Diff line
@@ -615,7 +615,6 @@ static void btmtksdio_txrx_work(struct work_struct *work) 


	sdio_release_host(bdev->func);



	pm_runtime_mark_last_busy(bdev->dev);

	pm_runtime_put_autosuspend(bdev->dev);

}

drivers/bluetooth/hci_bcm.c

+1 −5
Original line number Diff line number Diff line
@@ -326,7 +326,6 @@ static irqreturn_t bcm_host_wake(int irq, void *data) 
	bt_dev_dbg(bdev, "Host wake IRQ");



	pm_runtime_get(bdev->dev);

	pm_runtime_mark_last_busy(bdev->dev);

	pm_runtime_put_autosuspend(bdev->dev);



	return IRQ_HANDLED;
@@ -710,7 +709,6 @@ static int bcm_recv(struct hci_uart *hu, const void *data, int count) 
		mutex_lock(&bcm_device_lock);

		if (bcm->dev && bcm_device_exists(bcm->dev)) {

			pm_runtime_get(bcm->dev->dev);

			pm_runtime_mark_last_busy(bcm->dev->dev);

			pm_runtime_put_autosuspend(bcm->dev->dev);

		}

		mutex_unlock(&bcm_device_lock);
@@ -748,10 +746,8 @@ static struct sk_buff *bcm_dequeue(struct hci_uart *hu) 


	skb = skb_dequeue(&bcm->txq);



	if (bdev) {

		pm_runtime_mark_last_busy(bdev->dev);

	if (bdev)

		pm_runtime_put_autosuspend(bdev->dev);

	}



	mutex_unlock(&bcm_device_lock);

drivers/bluetooth/hci_h5.c

+0 −2
Original line number Diff line number Diff line
@@ -616,7 +616,6 @@ static int h5_recv(struct hci_uart *hu, const void *data, int count) 


	if (hu->serdev) {

		pm_runtime_get(&hu->serdev->dev);

		pm_runtime_mark_last_busy(&hu->serdev->dev);

		pm_runtime_put_autosuspend(&hu->serdev->dev);

	}
@@ -658,7 +657,6 @@ static int h5_enqueue(struct hci_uart *hu, struct sk_buff *skb) 


	if (hu->serdev) {

		pm_runtime_get_sync(&hu->serdev->dev);

		pm_runtime_mark_last_busy(&hu->serdev->dev);

		pm_runtime_put_autosuspend(&hu->serdev->dev);

	}

drivers/bluetooth/hci_intel.c

+0 −3
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ static irqreturn_t intel_irq(int irq, void *dev_id) 


	/* Host/Controller are now LPM resumed, trigger a new delayed suspend */

	pm_runtime_get(&idev->pdev->dev);

	pm_runtime_mark_last_busy(&idev->pdev->dev);

	pm_runtime_put_autosuspend(&idev->pdev->dev);



	return IRQ_HANDLED;
@@ -371,7 +370,6 @@ static void intel_busy_work(struct work_struct *work) 
	list_for_each_entry(idev, &intel_device_list, list) {

		if (intel->hu->tty->dev->parent == idev->pdev->dev.parent) {

			pm_runtime_get(&idev->pdev->dev);

			pm_runtime_mark_last_busy(&idev->pdev->dev);

			pm_runtime_put_autosuspend(&idev->pdev->dev);

			break;

		}
@@ -1003,7 +1001,6 @@ static int intel_enqueue(struct hci_uart *hu, struct sk_buff *skb) 
	list_for_each_entry(idev, &intel_device_list, list) {

		if (hu->tty->dev->parent == idev->pdev->dev.parent) {

			pm_runtime_get_sync(&idev->pdev->dev);

			pm_runtime_mark_last_busy(&idev->pdev->dev);

			pm_runtime_put_autosuspend(&idev->pdev->dev);

			break;

		}