[02/51] bluetooth: Switch to __pm_runtime_put_autosuspend()

Commit Message

Sakari Ailus Oct. 4, 2024, 9:41 a.m. UTC

pm_runtime_put_autosuspend() will soon be changed to include a call to
pm_runtime_mark_last_busy(). This patch switches the current users to
__pm_runtime_put_autosuspend() which will continue to have the
functionality of old pm_runtime_put_autosuspend().

Signed-off-by: Sakari Ailus <[e-mail]>
---
 drivers/bluetooth/btmtksdio.c | 2 +-
 drivers/bluetooth/hci_bcm.c   | 6 +++---
 drivers/bluetooth/hci_h5.c    | 4 ++--
 drivers/bluetooth/hci_intel.c | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

Patch

diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index cc097aedc1e1..a3bab78a5b1b 100644
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -615,7 +615,7 @@  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);
+	__pm_runtime_put_autosuspend(bdev->dev);
 }
 
 static void btmtksdio_interrupt(struct sdio_func *func)
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 89d4c2224546..5e3760c475b4 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -327,7 +327,7 @@  static irqreturn_t bcm_host_wake(int irq, void *data)
 
 	pm_runtime_get(bdev->dev);
 	pm_runtime_mark_last_busy(bdev->dev);
-	pm_runtime_put_autosuspend(bdev->dev);
+	__pm_runtime_put_autosuspend(bdev->dev);
 
 	return IRQ_HANDLED;
 }
@@ -711,7 +711,7 @@  static int bcm_recv(struct hci_uart *hu, const void *data, int count)
 		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);
+			__pm_runtime_put_autosuspend(bcm->dev->dev);
 		}
 		mutex_unlock(&bcm_device_lock);
 	}
@@ -750,7 +750,7 @@  static struct sk_buff *bcm_dequeue(struct hci_uart *hu)
 
 	if (bdev) {
 		pm_runtime_mark_last_busy(bdev->dev);
-		pm_runtime_put_autosuspend(bdev->dev);
+		__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 c0436881a533..4b1c978c57e7 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -593,7 +593,7 @@  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);
+		__pm_runtime_put_autosuspend(&hu->serdev->dev);
 	}
 
 	return 0;
@@ -635,7 +635,7 @@  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);
+		__pm_runtime_put_autosuspend(&hu->serdev->dev);
 	}
 
 	return 0;
diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
index 999ccd5bb4f2..373813717130 100644
--- a/drivers/bluetooth/hci_intel.c
+++ b/drivers/bluetooth/hci_intel.c
@@ -281,7 +281,7 @@  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);
+	__pm_runtime_put_autosuspend(&idev->pdev->dev);
 
 	return IRQ_HANDLED;
 }
@@ -372,7 +372,7 @@  static void intel_busy_work(struct work_struct *work)
 		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);
+			__pm_runtime_put_autosuspend(&idev->pdev->dev);
 			break;
 		}
 	}
@@ -1004,7 +1004,7 @@  static int intel_enqueue(struct hci_uart *hu, struct sk_buff *skb)
 		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);
+			__pm_runtime_put_autosuspend(&idev->pdev->dev);
 			break;
 		}
 	}