pm_runtime_put_autosuspend() will soon be changed to include a call to
pm_runtime_mark_last_busy(). This patch switches the current users to
__pm_runtime_put_autosuspend() which will continue to have the
functionality of old pm_runtime_put_autosuspend().
Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
---
drivers/tty/serial/8250/8250_omap.c | 18 +++++++++---------
drivers/tty/serial/8250/8250_port.c | 4 ++--
drivers/tty/serial/fsl_lpuart.c | 2 +-
drivers/tty/serial/serial_core.c | 2 +-
drivers/tty/serial/uartlite.c | 4 ++--
drivers/tty/serial/xilinx_uartps.c | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
index 88b58f44e4e9..8bd8284e591e 100644
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -208,7 +208,7 @@ static void omap8250_set_mctrl(struct uart_port *port, unsigned int mctrl)
__omap8250_set_mctrl(port, mctrl);
pm_runtime_mark_last_busy(port->dev);
- pm_runtime_put_autosuspend(port->dev);
+ __pm_runtime_put_autosuspend(port->dev);
}
/*
@@ -510,7 +510,7 @@ static void omap_8250_set_termios(struct uart_port *port,
uart_port_unlock_irq(&up->port);
pm_runtime_mark_last_busy(port->dev);
- pm_runtime_put_autosuspend(port->dev);
+ __pm_runtime_put_autosuspend(port->dev);
/* calculate wakeup latency constraint */
priv->calc_latency = USEC_PER_SEC * 64 * 8 / baud;
@@ -548,7 +548,7 @@ static void omap_8250_pm(struct uart_port *port, unsigned int state,
uart_port_unlock_irq(port);
pm_runtime_mark_last_busy(port->dev);
- pm_runtime_put_autosuspend(port->dev);
+ __pm_runtime_put_autosuspend(port->dev);
}
static void omap_serial_fill_features_erratas(struct uart_8250_port *up,
@@ -767,7 +767,7 @@ static int omap_8250_startup(struct uart_port *port)
enable_irq(up->port.irq);
pm_runtime_mark_last_busy(port->dev);
- pm_runtime_put_autosuspend(port->dev);
+ __pm_runtime_put_autosuspend(port->dev);
return 0;
}
@@ -805,7 +805,7 @@ static void omap_8250_shutdown(struct uart_port *port)
serial_out(up, UART_FCR, UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
pm_runtime_mark_last_busy(port->dev);
- pm_runtime_put_autosuspend(port->dev);
+ __pm_runtime_put_autosuspend(port->dev);
}
static void omap_8250_throttle(struct uart_port *port)
@@ -821,7 +821,7 @@ static void omap_8250_throttle(struct uart_port *port)
uart_port_unlock_irqrestore(port, flags);
pm_runtime_mark_last_busy(port->dev);
- pm_runtime_put_autosuspend(port->dev);
+ __pm_runtime_put_autosuspend(port->dev);
}
static void omap_8250_unthrottle(struct uart_port *port)
@@ -843,7 +843,7 @@ static void omap_8250_unthrottle(struct uart_port *port)
uart_port_unlock_irqrestore(port, flags);
pm_runtime_mark_last_busy(port->dev);
- pm_runtime_put_autosuspend(port->dev);
+ __pm_runtime_put_autosuspend(port->dev);
}
static int omap8250_rs485_config(struct uart_port *port,
@@ -1594,7 +1594,7 @@ static int omap8250_probe(struct platform_device *pdev)
}
priv->line = ret;
pm_runtime_mark_last_busy(&pdev->dev);
- pm_runtime_put_autosuspend(&pdev->dev);
+ __pm_runtime_put_autosuspend(&pdev->dev);
return 0;
err:
pm_runtime_dont_use_autosuspend(&pdev->dev);
@@ -1682,7 +1682,7 @@ static int omap8250_resume(struct device *dev)
serial8250_resume_port(priv->line);
/* Paired with pm_runtime_resume_and_get() in omap8250_suspend() */
pm_runtime_mark_last_busy(dev);
- pm_runtime_put_autosuspend(dev);
+ __pm_runtime_put_autosuspend(dev);
return 0;
}
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 3509af7dc52b..a94f30fac856 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -510,7 +510,7 @@ void serial8250_rpm_put(struct uart_8250_port *p)
if (!(p->capabilities & UART_CAP_RPM))
return;
pm_runtime_mark_last_busy(p->port.dev);
- pm_runtime_put_autosuspend(p->port.dev);
+ __pm_runtime_put_autosuspend(p->port.dev);
}
EXPORT_SYMBOL_GPL(serial8250_rpm_put);
@@ -654,7 +654,7 @@ void serial8250_rpm_put_tx(struct uart_8250_port *p)
if (!rpm_active)
return;
pm_runtime_mark_last_busy(p->port.dev);
- pm_runtime_put_autosuspend(p->port.dev);
+ __pm_runtime_put_autosuspend(p->port.dev);
}
EXPORT_SYMBOL_GPL(serial8250_rpm_put_tx);
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 77efa7ee6eda..5bf0d6d6f417 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -825,7 +825,7 @@ lpuart_uart_pm(struct uart_port *port, unsigned int state, unsigned int oldstate
switch (state) {
case UART_PM_STATE_OFF:
pm_runtime_mark_last_busy(port->dev);
- pm_runtime_put_autosuspend(port->dev);
+ __pm_runtime_put_autosuspend(port->dev);
break;
default:
pm_runtime_get_sync(port->dev);
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index d94d73e45fb6..906254bed9fa 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -159,7 +159,7 @@ static void __uart_start(struct uart_state *state)
if (!pm_runtime_enabled(port->dev) || pm_runtime_active(&port_dev->dev))
port->ops->start_tx(port);
pm_runtime_mark_last_busy(&port_dev->dev);
- pm_runtime_put_autosuspend(&port_dev->dev);
+ __pm_runtime_put_autosuspend(&port_dev->dev);
}
static void uart_start(struct tty_struct *tty)
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 68357ac8ffe3..a7ecdcbce6d3 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -423,7 +423,7 @@ static void ulite_pm(struct uart_port *port, unsigned int state,
dev_err(port->dev, "Failed to enable clocks\n");
} else {
pm_runtime_mark_last_busy(port->dev);
- pm_runtime_put_autosuspend(port->dev);
+ __pm_runtime_put_autosuspend(port->dev);
}
}
@@ -893,7 +893,7 @@ static int ulite_probe(struct platform_device *pdev)
ret = ulite_assign(&pdev->dev, id, res->start, irq, pdata);
pm_runtime_mark_last_busy(&pdev->dev);
- pm_runtime_put_autosuspend(&pdev->dev);
+ __pm_runtime_put_autosuspend(&pdev->dev);
return ret;
}
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 777392914819..a06afaa314d3 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -1241,7 +1241,7 @@ static void cdns_uart_pm(struct uart_port *port, unsigned int state,
switch (state) {
case UART_PM_STATE_OFF:
pm_runtime_mark_last_busy(port->dev);
- pm_runtime_put_autosuspend(port->dev);
+ __pm_runtime_put_autosuspend(port->dev);
break;
default:
pm_runtime_get_sync(port->dev);
--
2.39.5
