Skip to content

Commit b8414ba

Browse files
Sakari AilusVudentz
authored andcommitted
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 <[email protected]> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent 73d2d70 commit b8414ba

File tree

4 files changed

+1
-11
lines changed

4 files changed

+1
-11
lines changed

drivers/bluetooth/btmtksdio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,6 @@ static void btmtksdio_txrx_work(struct work_struct *work)
615615

616616
sdio_release_host(bdev->func);
617617

618-
pm_runtime_mark_last_busy(bdev->dev);
619618
pm_runtime_put_autosuspend(bdev->dev);
620619
}
621620

drivers/bluetooth/hci_bcm.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ static irqreturn_t bcm_host_wake(int irq, void *data)
326326
bt_dev_dbg(bdev, "Host wake IRQ");
327327

328328
pm_runtime_get(bdev->dev);
329-
pm_runtime_mark_last_busy(bdev->dev);
330329
pm_runtime_put_autosuspend(bdev->dev);
331330

332331
return IRQ_HANDLED;
@@ -710,7 +709,6 @@ static int bcm_recv(struct hci_uart *hu, const void *data, int count)
710709
mutex_lock(&bcm_device_lock);
711710
if (bcm->dev && bcm_device_exists(bcm->dev)) {
712711
pm_runtime_get(bcm->dev->dev);
713-
pm_runtime_mark_last_busy(bcm->dev->dev);
714712
pm_runtime_put_autosuspend(bcm->dev->dev);
715713
}
716714
mutex_unlock(&bcm_device_lock);
@@ -748,10 +746,8 @@ static struct sk_buff *bcm_dequeue(struct hci_uart *hu)
748746

749747
skb = skb_dequeue(&bcm->txq);
750748

751-
if (bdev) {
752-
pm_runtime_mark_last_busy(bdev->dev);
749+
if (bdev)
753750
pm_runtime_put_autosuspend(bdev->dev);
754-
}
755751

756752
mutex_unlock(&bcm_device_lock);
757753

drivers/bluetooth/hci_h5.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,6 @@ static int h5_recv(struct hci_uart *hu, const void *data, int count)
616616

617617
if (hu->serdev) {
618618
pm_runtime_get(&hu->serdev->dev);
619-
pm_runtime_mark_last_busy(&hu->serdev->dev);
620619
pm_runtime_put_autosuspend(&hu->serdev->dev);
621620
}
622621

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

659658
if (hu->serdev) {
660659
pm_runtime_get_sync(&hu->serdev->dev);
661-
pm_runtime_mark_last_busy(&hu->serdev->dev);
662660
pm_runtime_put_autosuspend(&hu->serdev->dev);
663661
}
664662

drivers/bluetooth/hci_intel.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ static irqreturn_t intel_irq(int irq, void *dev_id)
280280

281281
/* Host/Controller are now LPM resumed, trigger a new delayed suspend */
282282
pm_runtime_get(&idev->pdev->dev);
283-
pm_runtime_mark_last_busy(&idev->pdev->dev);
284283
pm_runtime_put_autosuspend(&idev->pdev->dev);
285284

286285
return IRQ_HANDLED;
@@ -371,7 +370,6 @@ static void intel_busy_work(struct work_struct *work)
371370
list_for_each_entry(idev, &intel_device_list, list) {
372371
if (intel->hu->tty->dev->parent == idev->pdev->dev.parent) {
373372
pm_runtime_get(&idev->pdev->dev);
374-
pm_runtime_mark_last_busy(&idev->pdev->dev);
375373
pm_runtime_put_autosuspend(&idev->pdev->dev);
376374
break;
377375
}
@@ -1003,7 +1001,6 @@ static int intel_enqueue(struct hci_uart *hu, struct sk_buff *skb)
10031001
list_for_each_entry(idev, &intel_device_list, list) {
10041002
if (hu->tty->dev->parent == idev->pdev->dev.parent) {
10051003
pm_runtime_get_sync(&idev->pdev->dev);
1006-
pm_runtime_mark_last_busy(&idev->pdev->dev);
10071004
pm_runtime_put_autosuspend(&idev->pdev->dev);
10081005
break;
10091006
}

0 commit comments

Comments
 (0)