[v2,3/6] serial: 8250/mediatek: mark PM functions as __maybe_unused

Message ID 1455205297-1021302-4-git-send-email-arnd@arndb.de
State Accepted
Commit 9db669f14fd8297c42c5d3ea06720e992845f48a
Headers show
  • serial: 8250: fixes for modular build
Related show

Commit Message

Arnd Bergmann Feb. 11, 2016, 3:41 p.m.
The mtk8250_runtime_suspend function is not used when runtime PM is
disabled, so we get a warning about an unused function:

drivers/tty/serial/8250/8250_mtk.c:119:12: error: 'mtk8250_runtime_suspend' defined but not used [-Werror=unused-function]
 static int mtk8250_runtime_suspend(struct device *dev)

This marks all the PM functions as __maybe_unused to avoid the warning,
and removes the #ifdef around the PM_SLEEP functions for consistency.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Matthias Brugger <matthias.bgg@gmail.com>

 drivers/tty/serial/8250/8250_mtk.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)


To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
index 78883ca64ddd..6ecc6e3e82dc 100644
--- a/drivers/tty/serial/8250/8250_mtk.c
+++ b/drivers/tty/serial/8250/8250_mtk.c
@@ -116,7 +116,7 @@  mtk8250_set_termios(struct uart_port *port, struct ktermios *termios,
 		tty_termios_encode_baud_rate(termios, baud, baud);
-static int mtk8250_runtime_suspend(struct device *dev)
+static int __maybe_unused mtk8250_runtime_suspend(struct device *dev)
 	struct mtk8250_data *data = dev_get_drvdata(dev);
@@ -126,7 +126,7 @@  static int mtk8250_runtime_suspend(struct device *dev)
 	return 0;
-static int mtk8250_runtime_resume(struct device *dev)
+static int __maybe_unused mtk8250_runtime_resume(struct device *dev)
 	struct mtk8250_data *data = dev_get_drvdata(dev);
 	int err;
@@ -262,8 +262,7 @@  static int mtk8250_remove(struct platform_device *pdev)
 	return 0;
-static int mtk8250_suspend(struct device *dev)
+static int __maybe_unused mtk8250_suspend(struct device *dev)
 	struct mtk8250_data *data = dev_get_drvdata(dev);
@@ -272,7 +271,7 @@  static int mtk8250_suspend(struct device *dev)
 	return 0;
-static int mtk8250_resume(struct device *dev)
+static int __maybe_unused mtk8250_resume(struct device *dev)
 	struct mtk8250_data *data = dev_get_drvdata(dev);
@@ -280,7 +279,6 @@  static int mtk8250_resume(struct device *dev)
 	return 0;
-#endif /* CONFIG_PM_SLEEP */
 static const struct dev_pm_ops mtk8250_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(mtk8250_suspend, mtk8250_resume)