On 30 Aug 2013, George Spelvin wrote:
> I was just compiling -rc7, and hit a bit of a roadblock in drivers/usb.
>
> CC drivers/usb/host/ohci-pci.o
> drivers/usb/host/ohci-pci.c: In function 'ohci_pci_init':
> drivers/usb/host/ohci-pci.c:309:35: error: 'ohci_suspend' undeclared (first
> use in this function)
> ohci_pci_hc_driver.pci_suspend = ohci_suspend;
> ^
> drivers/usb/host/ohci-pci.c:309:35: note: each undeclared identifier is
> reported only once for each function it appears in
> drivers/usb/host/ohci-pci.c:310:34: error: 'ohci_resume' undeclared (first
> use in this function)
> ohci_pci_hc_driver.pci_resume = ohci_resume;
> ^
> make[3]: *** [drivers/usb/host/ohci-pci.o] Error 1
> make[2]: *** [drivers/usb/host] Error 2
> make[1]: *** [drivers/usb] Error 2
> make: *** [drivers] Error 2
>
> This appears to be related to 9a11899c5e699a8d2551692dfcd4372e39dcbdf6,
> which added references to ohci_suspend and ohci_resume that didn't have
> the same CONFIG_PM wrapper as their declarations in ohci.h.
>
> (FWIW, Documentation/SubmitChecklist step 26 warns about this.)
The procedures outlined in that document are not practical for
everyone, unfortunately.
> The following is the obvious fix, but I don't know if it's the right one...
>
> diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
> index 0f1d193..062b410 100644
> --- a/drivers/usb/host/ohci-pci.c
> +++ b/drivers/usb/host/ohci-pci.c
> @@ -305,9 +305,11 @@ static int __init ohci_pci_init(void)
>
> ohci_init_driver(&ohci_pci_hc_driver, &pci_overrides);
>
> +#ifdef CONFIG_PM
> /* Entries for the PCI suspend/resume callbacks are special */
> ohci_pci_hc_driver.pci_suspend = ohci_suspend;
> ohci_pci_hc_driver.pci_resume = ohci_resume;
> +#endif
>
> return pci_register_driver(&ohci_pci_driver);
> }
This fix has already been merged by commit
d3474049ab6cfcf14274f5ab9f20c8f50b083eab. You may find that an
additional build error then surfaces; see
http://marc.info/?l=linux-usb&m=137787396530215&w=2
Alan Stern
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
