iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: xhci: tegra: mark PM functions as __maybe_unused

Browse Source 
The added #ifdefs in the PM rework were almost correct, but still
cause warnings in some randconfig builds:

drivers/usb/host/xhci-tegra.c:2147:12: error: 'tegra_xusb_resume' defined but not used [-Werror=unused-function]
 2147 | static int tegra_xusb_resume(struct device *dev)
      |            ^~~~~~~~~~~~~~~~~
drivers/usb/host/xhci-tegra.c:2105:12: error: 'tegra_xusb_suspend' defined but not used [-Werror=unused-function]
 2105 | static int tegra_xusb_suspend(struct device *dev)

Replace the #ifdef checks with simpler __maybe_unused annotations to
reliably shut up these warnings.

Link: https://lore.kernel.org/all/20210421135613.3560777-2-arnd@kernel.org/
Fixes: 971ee24706 ("usb: xhci: tegra: Enable ELPG for runtime/system PM")
Reviewed-by: JC Kuo <jckuo@nvidia.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20211005112057.2700888-1-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann 2021-10-05 13:20:28 +02:00 committed by Greg Kroah-Hartman
parent 5816b3e657
commit 3ea75b3f57
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/host/xhci-tegra.c
View File

@ -1787,7 +1787,6 @@ static int tegra_xusb_remove(struct platform_device *pdev)
return 0; return 0;
} }
#if IS_ENABLED(CONFIG_PM) || IS_ENABLED(CONFIG_PM_SLEEP)
static bool xhci_hub_ports_suspended(struct xhci_hub *hub) static bool xhci_hub_ports_suspended(struct xhci_hub *hub)
{ {
struct device *dev = hub->hcd->self.controller; struct device *dev = hub->hcd->self.controller;
@ -2102,7 +2101,7 @@ out:
return err; return err;
} }
static int tegra_xusb_suspend(struct device *dev) static __maybe_unused int tegra_xusb_suspend(struct device *dev)
{ {
struct tegra_xusb *tegra = dev_get_drvdata(dev); struct tegra_xusb *tegra = dev_get_drvdata(dev);
int err; int err;
@ -2144,7 +2143,7 @@ out:
return err; return err;
} }
static int tegra_xusb_resume(struct device *dev) static __maybe_unused int tegra_xusb_resume(struct device *dev)
{ {
struct tegra_xusb *tegra = dev_get_drvdata(dev); struct tegra_xusb *tegra = dev_get_drvdata(dev);
int err; int err;
@ -2174,10 +2173,8 @@ static int tegra_xusb_resume(struct device *dev)
return 0; return 0;
} }
#endif
#ifdef CONFIG_PM static __maybe_unused int tegra_xusb_runtime_suspend(struct device *dev)
static int tegra_xusb_runtime_suspend(struct device *dev)
{ {
struct tegra_xusb *tegra = dev_get_drvdata(dev); struct tegra_xusb *tegra = dev_get_drvdata(dev);
int ret; int ret;
@ -2190,7 +2187,7 @@ static int tegra_xusb_runtime_suspend(struct device *dev)
return ret; return ret;
} }
static int tegra_xusb_runtime_resume(struct device *dev) static __maybe_unused int tegra_xusb_runtime_resume(struct device *dev)
{ {
struct tegra_xusb *tegra = dev_get_drvdata(dev); struct tegra_xusb *tegra = dev_get_drvdata(dev);
int err; int err;
@ -2201,7 +2198,6 @@ static int tegra_xusb_runtime_resume(struct device *dev)
return err; return err;
} }
#endif
static const struct dev_pm_ops tegra_xusb_pm_ops = { static const struct dev_pm_ops tegra_xusb_pm_ops = {
SET_RUNTIME_PM_OPS(tegra_xusb_runtime_suspend, SET_RUNTIME_PM_OPS(tegra_xusb_runtime_suspend,