lkml.org 
[lkml]   [2020]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 01/20] usb/host: ohci-platform: Use pm_ptr() macro
Date
Use the newly introduced pm_ptr() macro, and mark the suspend/resume
functions __maybe_unused. These functions can then be moved outside the
CONFIG_PM_SUSPEND block, and the compiler can then process them and
detect build failures independently of the config. If unused, they will
simply be discarded by the compiler.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/usb/host/ohci-platform.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index 4a8456f12a73..21400d7d8b0a 100644
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -176,22 +176,21 @@ static int ohci_platform_probe(struct platform_device *dev)
if (pdata->num_ports)
ohci->num_ports = pdata->num_ports;

-#ifndef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
- if (ohci->flags & OHCI_QUIRK_BE_MMIO) {
+ if (!IS_ENABLED(CONFIG_USB_OHCI_BIG_ENDIAN_MMIO) &&
+ ohci->flags & OHCI_QUIRK_BE_MMIO) {
dev_err(&dev->dev,
"Error: CONFIG_USB_OHCI_BIG_ENDIAN_MMIO not set\n");
err = -EINVAL;
goto err_reset;
}
-#endif
-#ifndef CONFIG_USB_OHCI_BIG_ENDIAN_DESC
- if (ohci->flags & OHCI_QUIRK_BE_DESC) {
+
+ if (!IS_ENABLED(CONFIG_USB_OHCI_BIG_ENDIAN_DESC) &&
+ ohci->flags & OHCI_QUIRK_BE_DESC) {
dev_err(&dev->dev,
"Error: CONFIG_USB_OHCI_BIG_ENDIAN_DESC not set\n");
err = -EINVAL;
goto err_reset;
}
-#endif

pm_runtime_set_active(&dev->dev);
pm_runtime_enable(&dev->dev);
@@ -267,8 +266,7 @@ static int ohci_platform_remove(struct platform_device *dev)
return 0;
}

-#ifdef CONFIG_PM_SLEEP
-static int ohci_platform_suspend(struct device *dev)
+static int __maybe_unused ohci_platform_suspend(struct device *dev)
{
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct usb_ohci_pdata *pdata = dev->platform_data;
@@ -286,7 +284,7 @@ static int ohci_platform_suspend(struct device *dev)
return ret;
}

-static int ohci_platform_resume(struct device *dev)
+static int __maybe_unused ohci_platform_resume(struct device *dev)
{
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct usb_ohci_pdata *pdata = dev_get_platdata(dev);
@@ -306,7 +304,6 @@ static int ohci_platform_resume(struct device *dev)

return 0;
}
-#endif /* CONFIG_PM_SLEEP */

static const struct of_device_id ohci_platform_ids[] = {
{ .compatible = "generic-ohci", },
@@ -332,7 +329,7 @@ static struct platform_driver ohci_platform_driver = {
.shutdown = usb_hcd_platform_shutdown,
.driver = {
.name = "ohci-platform",
- .pm = &ohci_platform_pm_ops,
+ .pm = pm_ptr(&ohci_platform_pm_ops),
.of_match_table = ohci_platform_ids,
}
};
--
2.28.0
\
 
 \ /
  Last update: 2020-09-03 13:30    [W:0.177 / U:31.028 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site