Skip to content

Commit ca50b29

Browse files
Sakari Ailussre
authored andcommitted
HSI: omap_ssi_port: 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> Link: https://lore.kernel.org/r/20250704075413.3218357-1-sakari.ailus@linux.intel.com Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 8f5ae30 commit ca50b29

1 file changed

Lines changed: 0 additions & 11 deletions

File tree

drivers/hsi/controllers/omap_ssi_port.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,6 @@ static int ssi_async_break(struct hsi_msg *msg)
362362
spin_unlock_bh(&omap_port->lock);
363363
}
364364
out:
365-
pm_runtime_mark_last_busy(omap_port->pdev);
366365
pm_runtime_put_autosuspend(omap_port->pdev);
367366

368367
return err;
@@ -401,7 +400,6 @@ static int ssi_async(struct hsi_msg *msg)
401400
msg->status = HSI_STATUS_ERROR;
402401
}
403402
spin_unlock_bh(&omap_port->lock);
404-
pm_runtime_mark_last_busy(omap_port->pdev);
405403
pm_runtime_put_autosuspend(omap_port->pdev);
406404
dev_dbg(&port->device, "msg status %d ttype %d ch %d\n",
407405
msg->status, msg->ttype, msg->channel);
@@ -504,7 +502,6 @@ static int ssi_setup(struct hsi_client *cl)
504502
omap_port->ssr.mode = cl->rx_cfg.mode;
505503
out:
506504
spin_unlock_bh(&omap_port->lock);
507-
pm_runtime_mark_last_busy(omap_port->pdev);
508505
pm_runtime_put_autosuspend(omap_port->pdev);
509506

510507
return err;
@@ -570,7 +567,6 @@ static int ssi_flush(struct hsi_client *cl)
570567
pinctrl_pm_select_default_state(omap_port->pdev);
571568

572569
spin_unlock_bh(&omap_port->lock);
573-
pm_runtime_mark_last_busy(omap_port->pdev);
574570
pm_runtime_put_autosuspend(omap_port->pdev);
575571

576572
return 0;
@@ -625,7 +621,6 @@ static int ssi_stop_tx(struct hsi_client *cl)
625621
writel(SSI_WAKE(0), omap_ssi->sys + SSI_CLEAR_WAKE_REG(port->num));
626622
spin_unlock_bh(&omap_port->wk_lock);
627623

628-
pm_runtime_mark_last_busy(omap_port->pdev);
629624
pm_runtime_put_autosuspend(omap_port->pdev); /* Release clocks */
630625

631626

@@ -653,7 +648,6 @@ static void ssi_transfer(struct omap_ssi_port *omap_port,
653648
}
654649
}
655650
spin_unlock_bh(&omap_port->lock);
656-
pm_runtime_mark_last_busy(omap_port->pdev);
657651
pm_runtime_put_autosuspend(omap_port->pdev);
658652
}
659653

@@ -683,7 +677,6 @@ static void ssi_cleanup_queues(struct hsi_client *cl)
683677
txbufstate |= (1 << i);
684678
status |= SSI_DATAACCEPT(i);
685679
/* Release the clocks writes, also GDD ones */
686-
pm_runtime_mark_last_busy(omap_port->pdev);
687680
pm_runtime_put_autosuspend(omap_port->pdev);
688681
}
689682
ssi_flush_queue(&omap_port->txqueue[i], cl);
@@ -739,7 +732,6 @@ static void ssi_cleanup_gdd(struct hsi_controller *ssi, struct hsi_client *cl)
739732
* ssi_cleanup_queues
740733
*/
741734
if (msg->ttype == HSI_MSG_READ) {
742-
pm_runtime_mark_last_busy(omap_port->pdev);
743735
pm_runtime_put_autosuspend(omap_port->pdev);
744736
}
745737
omap_ssi->gdd_trn[i].msg = NULL;
@@ -936,7 +928,6 @@ static void ssi_pio_complete(struct hsi_port *port, struct list_head *queue)
936928
reg = readl(omap_ssi->sys + SSI_MPU_ENABLE_REG(port->num, 0));
937929
if (msg->ttype == HSI_MSG_WRITE) {
938930
/* Release clocks for write transfer */
939-
pm_runtime_mark_last_busy(omap_port->pdev);
940931
pm_runtime_put_autosuspend(omap_port->pdev);
941932
}
942933
reg &= ~val;
@@ -981,7 +972,6 @@ static irqreturn_t ssi_pio_thread(int irq, void *ssi_port)
981972
/* TODO: sleep if we retry? */
982973
} while (status_reg);
983974

984-
pm_runtime_mark_last_busy(omap_port->pdev);
985975
pm_runtime_put_autosuspend(omap_port->pdev);
986976

987977
return IRQ_HANDLED;
@@ -1018,7 +1008,6 @@ static irqreturn_t ssi_wake_thread(int irq __maybe_unused, void *ssi_port)
10181008
}
10191009
hsi_event(port, HSI_EVENT_STOP_RX);
10201010
if (test_and_clear_bit(SSI_WAKE_EN, &omap_port->flags)) {
1021-
pm_runtime_mark_last_busy(omap_port->pdev);
10221011
pm_runtime_put_autosuspend(omap_port->pdev);
10231012
}
10241013
}

0 commit comments

Comments
 (0)