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: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index 62db31bd659283d7aad12f5b23fdfa4ae0ed7770..fba3ab6d30a5a0e4eeeda09e5855a4e90748a7d8 100644 (file)
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -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);
 }
 

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index fff845ed44e35f26f5ddf4247d9bc80b28596ce5..9286a5f40f55d409f15b8f9f386ce9cc18c9f521 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -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);
 

diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index 43371f389fd2dbbd5f463b2f8c88c12a6ddbf02c..96e20a66ecd17151b53a19b5458fc8d59c82c419 100644 (file)
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -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);
        }
 

diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
index 1d6e09508f1f2e93947ca2d9089b7d82519795ad..20baf2895dec7aa51419279d452e3c502b22b037 100644 (file)
--- a/drivers/bluetooth/hci_intel.c
+++ b/drivers/bluetooth/hci_intel.c
@@ -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;
                }