On Fri, Oct 15, 2010 at 02:59:15PM -0700, Sarah Sharp wrote:
> Fix these linker errors when CONFIG_PM=n:
>
> ERROR: "xhci_bus_resume" [drivers/usb/host/xhci-hcd.ko] undefined!
> ERROR: "xhci_bus_suspend" [drivers/usb/host/xhci-hcd.ko] undefined!
>
> Reported-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
> Signed-off-by: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
> ---
>
> Randy, this should fix your linker errors. Without the patch, I get the
> same errors, and with the patch I don't.
>
> Greg, this applies on top of the previous patch.
>
> drivers/usb/host/xhci-hub.c | 7 +------
> drivers/usb/host/xhci.c | 6 ------
> drivers/usb/host/xhci.h | 14 ++++++++++++++
> 3 files changed, 15 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
> index 7f2f63c..fef5a1f 100644
> --- a/drivers/usb/host/xhci-hub.c
> +++ b/drivers/usb/host/xhci-hub.c
> @@ -742,9 +742,4 @@ int xhci_bus_resume(struct usb_hcd *hcd)
> return 0;
> }
>
> -#else
> -
> -#define xhci_bus_suspend NULL
> -#define xhci_bus_resume NULL
> -
> -#endif
> +#endif /* CONFIG_PM */
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index 9dc5be5..5d7d4e9 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -761,12 +761,6 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
> spin_unlock_irq(&xhci->lock);
> return 0;
> }
> -
> -#else
> -
> -#define xhci_suspend NULL
> -#define xhci_resume NULL
> -
> #endif /* CONFIG_PM */
>
> /*-------------------------------------------------------------------------*/
> diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
> index c08928a..93d3bf4 100644
> --- a/drivers/usb/host/xhci.h
> +++ b/drivers/usb/host/xhci.h
> @@ -1405,8 +1405,15 @@ int xhci_init(struct usb_hcd *hcd);
> int xhci_run(struct usb_hcd *hcd);
> void xhci_stop(struct usb_hcd *hcd);
> void xhci_shutdown(struct usb_hcd *hcd);
> +
> +#ifdef CONFIG_PM
> 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
> +#endif
> +
"static inline int xhci_suspend(struct xhci_hcd *) {}"
has the same effect but saves types
> int xhci_get_frame(struct usb_hcd *hcd);
> irqreturn_t xhci_irq(struct usb_hcd *hcd);
> irqreturn_t xhci_msi_irq(int irq, struct usb_hcd *hcd);
> @@ -1481,8 +1488,15 @@ void xhci_ring_ep_doorbell(struct xhci_hcd *xhci, unsigned int slot_id,
> int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex,
> char *buf, u16 wLength);
> int xhci_hub_status_data(struct usb_hcd *hcd, char *buf);
> +
> +#ifdef CONFIG_PM
> int xhci_bus_suspend(struct usb_hcd *hcd);
> int xhci_bus_resume(struct usb_hcd *hcd);
> +#else
> +#define xhci_bus_suspend NULL
> +#define xhci_bus_resume NULL
> +#endif /* CONFIG_PM */
> +
> u32 xhci_port_state_to_neutral(u32 state);
> int xhci_find_slot_id_by_port(struct xhci_hcd *xhci, u16 port);
> void xhci_ring_device(struct xhci_hcd *xhci, int slot_id);
> --
> 1.6.3.3
>
> --
> 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/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
