On Wed, Feb 12, 2020 at 12:40 AM Rafael J. Wysocki <rjw@xxxxxxxxxxxxx> wrote: > > From: "Rafael J. Wysocki" <rafael.j.wysocki@xxxxxxxxx> > > Call cpu_latency_qos_add/update/remove_request() instead of > pm_qos_add/update/remove_request(), respectively, because the > latter are going to be dropped. > > No intentional functional impact. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> Please note that the whole series is available here: https://lore.kernel.org/linux-pm/1654227.8mz0SueHsU@kreacher/ > --- > drivers/tty/serial/8250/8250_omap.c | 7 +++---- > drivers/tty/serial/omap-serial.c | 9 ++++----- > 2 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c > index 19f8d2f9e7ba..76fe72bfb8bb 100644 > --- a/drivers/tty/serial/8250/8250_omap.c > +++ b/drivers/tty/serial/8250/8250_omap.c > @@ -569,7 +569,7 @@ static void omap8250_uart_qos_work(struct work_struct *work) > struct omap8250_priv *priv; > > priv = container_of(work, struct omap8250_priv, qos_work); > - pm_qos_update_request(&priv->pm_qos_request, priv->latency); > + cpu_latency_qos_update_request(&priv->pm_qos_request, priv->latency); > } > > #ifdef CONFIG_SERIAL_8250_DMA > @@ -1224,8 +1224,7 @@ static int omap8250_probe(struct platform_device *pdev) > > priv->latency = PM_QOS_CPU_LATENCY_DEFAULT_VALUE; > priv->calc_latency = PM_QOS_CPU_LATENCY_DEFAULT_VALUE; > - pm_qos_add_request(&priv->pm_qos_request, PM_QOS_CPU_DMA_LATENCY, > - priv->latency); > + cpu_latency_qos_add_request(&priv->pm_qos_request, priv->latency); > INIT_WORK(&priv->qos_work, omap8250_uart_qos_work); > > spin_lock_init(&priv->rx_dma_lock); > @@ -1295,7 +1294,7 @@ static int omap8250_remove(struct platform_device *pdev) > pm_runtime_put_sync(&pdev->dev); > pm_runtime_disable(&pdev->dev); > serial8250_unregister_port(priv->line); > - pm_qos_remove_request(&priv->pm_qos_request); > + cpu_latency_qos_remove_request(&priv->pm_qos_request); > device_init_wakeup(&pdev->dev, false); > return 0; > } > diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c > index ce2558767eee..e0b720ac754b 100644 > --- a/drivers/tty/serial/omap-serial.c > +++ b/drivers/tty/serial/omap-serial.c > @@ -831,7 +831,7 @@ static void serial_omap_uart_qos_work(struct work_struct *work) > struct uart_omap_port *up = container_of(work, struct uart_omap_port, > qos_work); > > - pm_qos_update_request(&up->pm_qos_request, up->latency); > + cpu_latency_qos_update_request(&up->pm_qos_request, up->latency); > } > > static void > @@ -1724,8 +1724,7 @@ static int serial_omap_probe(struct platform_device *pdev) > > up->latency = PM_QOS_CPU_LATENCY_DEFAULT_VALUE; > up->calc_latency = PM_QOS_CPU_LATENCY_DEFAULT_VALUE; > - pm_qos_add_request(&up->pm_qos_request, > - PM_QOS_CPU_DMA_LATENCY, up->latency); > + cpu_latency_qos_add_request(&up->pm_qos_request, up->latency); > INIT_WORK(&up->qos_work, serial_omap_uart_qos_work); > > platform_set_drvdata(pdev, up); > @@ -1759,7 +1758,7 @@ static int serial_omap_probe(struct platform_device *pdev) > pm_runtime_dont_use_autosuspend(&pdev->dev); > pm_runtime_put_sync(&pdev->dev); > pm_runtime_disable(&pdev->dev); > - pm_qos_remove_request(&up->pm_qos_request); > + cpu_latency_qos_remove_request(&up->pm_qos_request); > device_init_wakeup(up->dev, false); > err_rs485: > err_port_line: > @@ -1777,7 +1776,7 @@ static int serial_omap_remove(struct platform_device *dev) > pm_runtime_dont_use_autosuspend(up->dev); > pm_runtime_put_sync(up->dev); > pm_runtime_disable(up->dev); > - pm_qos_remove_request(&up->pm_qos_request); > + cpu_latency_qos_remove_request(&up->pm_qos_request); > device_init_wakeup(&dev->dev, false); > > return 0; > -- > 2.16.4 > > > > >
