Commit 01d2b189 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

drivers: tty: Call cpu_latency_qos_*() instead of pm_qos_*() 



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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarAmit Kucheria <amit.kucheria@linaro.org>
Tested-by: default avatarAmit Kucheria <amit.kucheria@linaro.org>
parent c4c632e9

drivers/tty/serial/8250/8250_omap.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

}

drivers/tty/serial/omap-serial.c

+4 −5
Original line number Diff line number Diff line
@@ -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 @@ err_add_port: 
	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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE