mei: 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>
Acked-by: Alexander Usyskin <alexander.usyskin@intel.com>
Link: https://patch.msgid.link/20251027114118.390775-1-sakari.ailus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 159e8b841564f45446b3b853d9f7598727f6d90b..5dc665515263f4bb8fac3327e508d1785a2bff60 100644 (file)
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -709,7 +709,6 @@ void mei_host_client_init(struct mei_device *dev)
 
        schedule_work(&dev->bus_rescan_work);
 
-       pm_runtime_mark_last_busy(dev->parent);
        dev_dbg(&dev->dev, "rpm: autosuspend\n");
        pm_request_autosuspend(dev->parent);
 }
@@ -991,7 +990,6 @@ int mei_cl_disconnect(struct mei_cl *cl)
        rets = __mei_cl_disconnect(cl);
 
        cl_dbg(dev, cl, "rpm: autosuspend\n");
-       pm_runtime_mark_last_busy(dev->parent);
        pm_runtime_put_autosuspend(dev->parent);
 
        return rets;
@@ -1167,7 +1165,6 @@ int mei_cl_connect(struct mei_cl *cl, struct mei_me_client *me_cl,
        rets = cl->status;
 out:
        cl_dbg(dev, cl, "rpm: autosuspend\n");
-       pm_runtime_mark_last_busy(dev->parent);
        pm_runtime_put_autosuspend(dev->parent);
 
        mei_io_cb_free(cb);
@@ -1554,7 +1551,6 @@ int mei_cl_notify_request(struct mei_cl *cl,
 
 out:
        cl_dbg(dev, cl, "rpm: autosuspend\n");
-       pm_runtime_mark_last_busy(dev->parent);
        pm_runtime_put_autosuspend(dev->parent);
 
        mei_io_cb_free(cb);
@@ -1702,7 +1698,6 @@ int mei_cl_read_start(struct mei_cl *cl, size_t length, const struct file *fp)
 
 out:
        cl_dbg(dev, cl, "rpm: autosuspend\n");
-       pm_runtime_mark_last_busy(dev->parent);
        pm_runtime_put_autosuspend(dev->parent);
 nortpm:
        if (rets)
@@ -2092,7 +2087,6 @@ out:
        rets = buf_len;
 err:
        cl_dbg(dev, cl, "rpm: autosuspend\n");
-       pm_runtime_mark_last_busy(dev->parent);
        pm_runtime_put_autosuspend(dev->parent);
 free:
        mei_io_cb_free(cb);
@@ -2116,12 +2110,10 @@ void mei_cl_complete(struct mei_cl *cl, struct mei_cl_cb *cb)
        case MEI_FOP_WRITE:
                mei_tx_cb_dequeue(cb);
                cl->writing_state = MEI_WRITE_COMPLETE;
-               if (waitqueue_active(&cl->tx_wait)) {
+               if (waitqueue_active(&cl->tx_wait))
                        wake_up_interruptible(&cl->tx_wait);
-               } else {
-                       pm_runtime_mark_last_busy(dev->parent);
+               else
                        pm_request_autosuspend(dev->parent);
-               }
                break;
 
        case MEI_FOP_READ:
@@ -2366,7 +2358,6 @@ out:
                mei_cl_dma_free(cl);
 
        cl_dbg(dev, cl, "rpm: autosuspend\n");
-       pm_runtime_mark_last_busy(dev->parent);
        pm_runtime_put_autosuspend(dev->parent);
 
        mei_io_cb_free(cb);
@@ -2444,7 +2435,6 @@ int mei_cl_dma_unmap(struct mei_cl *cl, const struct file *fp)
                mei_cl_dma_free(cl);
 out:
        cl_dbg(dev, cl, "rpm: autosuspend\n");
-       pm_runtime_mark_last_busy(dev->parent);
        pm_runtime_put_autosuspend(dev->parent);
 
        mei_io_cb_free(cb);

diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 3aa66b6b0d36a011af7e7420c31f4750cdfd0f62..3f210413fd32c79f21912e4680c6886134b73369 100644 (file)
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -229,7 +229,6 @@ static int mei_cl_irq_read_msg(struct mei_cl *cl,
                cl_dbg(dev, cl, "completed read length = %zu\n", cb->buf_idx);
                list_move_tail(&cb->list, cmpl_list);
        } else {
-               pm_runtime_mark_last_busy(dev->parent);
                pm_request_autosuspend(dev->parent);
        }
 
@@ -310,7 +309,6 @@ static int mei_cl_irq_read(struct mei_cl *cl, struct mei_cl_cb *cb,
                return ret;
        }
 
-       pm_runtime_mark_last_busy(dev->parent);
        pm_request_autosuspend(dev->parent);
 
        list_move_tail(&cb->list, &cl->rd_pending);