[RFC/PATCH 2/3] usb/xhci: implement proper static inline stubs when !CONFIG_PM

From: David Cohen
Date: Fri Dec 13 2013 - 00:15:00 EST


Current xhci_suspend() and xhci_resume() implementation in case of
CONFIG_PM not defined is buggy. If we try to use them we get the
following error:

drivers/usb/host/xhci-plat.c: In function âxhci_plat_suspendâ:
drivers/usb/host/xhci-plat.c:205:21: error: called object â0uâ is not a function
drivers/usb/host/xhci-plat.c: In function âxhci_plat_resumeâ:
drivers/usb/host/xhci-plat.c:213:20: error: called object â0uâ is not a function

It happens because the function names are replaced by NULL but the
brackets stay: NULL()

This patch implements proper static inline stubs.

Signed-off-by: David Cohen <david.a.cohen@xxxxxxxxxxxxxxx>
---
drivers/usb/host/xhci.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 941d5f59e4dc..6a5e7a98de7e 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1771,8 +1771,10 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks);
int xhci_suspend(struct xhci_hcd *xhci);
int xhci_resume(struct xhci_hcd *xhci, bool hibernated);
#else
-#define xhci_suspend NULL
-#define xhci_resume NULL
+static inline int
+xhci_suspend(struct xhci_hcd *xhci) { return 0; }
+static inline int
+xhci_resume(struct xhci_hcd *xhci, bool hibernated) { return 0; }
#endif

int xhci_get_frame(struct usb_hcd *hcd);
--
1.8.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/