net: ipa: 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>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://patch.msgid.link/20251027115022.390997-2-sakari.ailus@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/ipa_interrupt.c b/drivers/net/ipa/ipa_interrupt.c
index 245a06997055699e5dc2e29b49cb96ed91d8a1c9..8336596b124769e44ba6a98d2a76040206d97f57 100644 (file)
--- a/drivers/net/ipa/ipa_interrupt.c
+++ b/drivers/net/ipa/ipa_interrupt.c
@@ -149,7 +149,6 @@ static irqreturn_t ipa_isr_thread(int irq, void *dev_id)
                iowrite32(pending, ipa->reg_virt + reg_offset(reg));
        }
 out_power_put:
-       pm_runtime_mark_last_busy(dev);
        (void)pm_runtime_put_autosuspend(dev);
 
        return IRQ_HANDLED;

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index 25500c5a6928e46053efceddb403848a50e7ae87..95a61bae3124e1c9a71ec6b62fa4b67dca935df9 100644 (file)
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -903,7 +903,6 @@ static int ipa_probe(struct platform_device *pdev)
        if (ret)
                goto err_deconfig;
 done:
-       pm_runtime_mark_last_busy(dev);
        (void)pm_runtime_put_autosuspend(dev);
 
        return 0;

diff --git a/drivers/net/ipa/ipa_modem.c b/drivers/net/ipa/ipa_modem.c
index 8fe0d0e1a00fdf0df932c99a0ccfe125a6f98b74..9b136f6b8b4ae8d5005b34b5c5780c4cc0e5a674 100644 (file)
--- a/drivers/net/ipa/ipa_modem.c
+++ b/drivers/net/ipa/ipa_modem.c
@@ -71,7 +71,6 @@ static int ipa_open(struct net_device *netdev)
 
        netif_start_queue(netdev);
 
-       pm_runtime_mark_last_busy(dev);
        (void)pm_runtime_put_autosuspend(dev);
 
        return 0;
@@ -102,7 +101,6 @@ static int ipa_stop(struct net_device *netdev)
        ipa_endpoint_disable_one(priv->rx);
        ipa_endpoint_disable_one(priv->tx);
 out_power_put:
-       pm_runtime_mark_last_busy(dev);
        (void)pm_runtime_put_autosuspend(dev);
 
        return 0;
@@ -175,7 +173,6 @@ ipa_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 
        ret = ipa_endpoint_skb_tx(endpoint, skb);
 
-       pm_runtime_mark_last_busy(dev);
        (void)pm_runtime_put_autosuspend(dev);
 
        if (ret) {
@@ -432,7 +429,6 @@ static void ipa_modem_crashed(struct ipa *ipa)
                dev_err(dev, "error %d zeroing modem memory regions\n", ret);
 
 out_power_put:
-       pm_runtime_mark_last_busy(dev);
        (void)pm_runtime_put_autosuspend(dev);
 }
 

diff --git a/drivers/net/ipa/ipa_smp2p.c b/drivers/net/ipa/ipa_smp2p.c
index fcaadd111a8a309fba9640d3f5b835c3ab263091..420098796eec78bd2bded65091ed29a0fe21bf2f 100644 (file)
--- a/drivers/net/ipa/ipa_smp2p.c
+++ b/drivers/net/ipa/ipa_smp2p.c
@@ -171,7 +171,6 @@ static irqreturn_t ipa_smp2p_modem_setup_ready_isr(int irq, void *dev_id)
        WARN(ret != 0, "error %d from ipa_setup()\n", ret);
 
 out_power_put:
-       pm_runtime_mark_last_busy(dev);
        (void)pm_runtime_put_autosuspend(dev);
 
        return IRQ_HANDLED;
@@ -213,7 +212,6 @@ static void ipa_smp2p_power_release(struct ipa *ipa)
        if (!ipa->smp2p->power_on)
                return;
 
-       pm_runtime_mark_last_busy(dev);
        (void)pm_runtime_put_autosuspend(dev);
        ipa->smp2p->power_on = false;
 }

diff --git a/drivers/net/ipa/ipa_uc.c b/drivers/net/ipa/ipa_uc.c
index 2963db83ab6b0e250b1ca6227355e8d9f0512b80..dc7e92f2a4fbbd7cdbf7db8678433f574e5acd55 100644 (file)
--- a/drivers/net/ipa/ipa_uc.c
+++ b/drivers/net/ipa/ipa_uc.c
@@ -158,7 +158,6 @@ static void ipa_uc_response_hdlr(struct ipa *ipa)
                if (ipa->uc_powered) {
                        ipa->uc_loaded = true;
                        ipa_power_retention(ipa, true);
-                       pm_runtime_mark_last_busy(dev);
                        (void)pm_runtime_put_autosuspend(dev);
                        ipa->uc_powered = false;
                } else {
@@ -203,7 +202,6 @@ void ipa_uc_deconfig(struct ipa *ipa)
        if (!ipa->uc_powered)
                return;
 
-       pm_runtime_mark_last_busy(dev);
        (void)pm_runtime_put_autosuspend(dev);
 }