Skip to content

Commit 2a2b88a

Browse files
Sakari Ailusgregkh
authored andcommitted
mailbox: mtk-cmdq-mailbox: Switch to __pm_runtime_put_autosuspend()
[ Upstream commit 08fb6d8 ] 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 <sakari.ailus@linux.intel.com> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com> Stable-dep-of: 3f39f56 ("mailbox: mtk-cmdq: Remove pm_runtime APIs from cmdq_mbox_send_data()") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent f36a305 commit 2a2b88a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/mailbox/mtk-cmdq-mailbox.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ static int cmdq_mbox_send_data(struct mbox_chan *chan, void *data)
390390

391391
task = kzalloc(sizeof(*task), GFP_ATOMIC);
392392
if (!task) {
393-
pm_runtime_put_autosuspend(cmdq->mbox.dev);
393+
__pm_runtime_put_autosuspend(cmdq->mbox.dev);
394394
return -ENOMEM;
395395
}
396396

@@ -440,7 +440,7 @@ static int cmdq_mbox_send_data(struct mbox_chan *chan, void *data)
440440
list_move_tail(&task->list_entry, &thread->task_busy_list);
441441

442442
pm_runtime_mark_last_busy(cmdq->mbox.dev);
443-
pm_runtime_put_autosuspend(cmdq->mbox.dev);
443+
__pm_runtime_put_autosuspend(cmdq->mbox.dev);
444444

445445
return 0;
446446
}
@@ -488,7 +488,7 @@ static void cmdq_mbox_shutdown(struct mbox_chan *chan)
488488
spin_unlock_irqrestore(&thread->chan->lock, flags);
489489

490490
pm_runtime_mark_last_busy(cmdq->mbox.dev);
491-
pm_runtime_put_autosuspend(cmdq->mbox.dev);
491+
__pm_runtime_put_autosuspend(cmdq->mbox.dev);
492492
}
493493

494494
static int cmdq_mbox_flush(struct mbox_chan *chan, unsigned long timeout)
@@ -528,7 +528,7 @@ static int cmdq_mbox_flush(struct mbox_chan *chan, unsigned long timeout)
528528
out:
529529
spin_unlock_irqrestore(&thread->chan->lock, flags);
530530
pm_runtime_mark_last_busy(cmdq->mbox.dev);
531-
pm_runtime_put_autosuspend(cmdq->mbox.dev);
531+
__pm_runtime_put_autosuspend(cmdq->mbox.dev);
532532

533533
return 0;
534534

@@ -543,7 +543,7 @@ static int cmdq_mbox_flush(struct mbox_chan *chan, unsigned long timeout)
543543
return -EFAULT;
544544
}
545545
pm_runtime_mark_last_busy(cmdq->mbox.dev);
546-
pm_runtime_put_autosuspend(cmdq->mbox.dev);
546+
__pm_runtime_put_autosuspend(cmdq->mbox.dev);
547547
return 0;
548548
}
549549

0 commit comments

Comments
 (0)