Re: [patch 2/2] ssb: Add a driver for the Broadcom OHCI core

[Michael Buesch <mb@bu3sch.de>]

On Thursday 12 July 2007 19:49, Andrew Morton wrote:
> Here, we'd normally do
> 
> #else
> #define ssb_ohci_hcd_suspend NULL
> #define ssb_ohci_hcd_resume NULL

Ah, well. I don't care either way, so if that is the preferred way to deal
with it, I'll change :)

> > Index: linux-2.6/drivers/usb/host/ohci-hcd.c
> > ===================================================================
> > --- linux-2.6.orig/drivers/usb/host/ohci-hcd.c	2007-07-12 10:51:46.000000000 +0200
> > +++ linux-2.6/drivers/usb/host/ohci-hcd.c	2007-07-12 10:52:45.000000000 +0200
> > @@ -920,11 +920,17 @@ MODULE_LICENSE ("GPL");
> >  #define PS3_SYSTEM_BUS_DRIVER	ps3_ohci_sb_driver
> >  #endif
> >  
> > +#ifdef CONFIG_USB_OHCI_HCD_SSB
> > +#include "ohci-ssb.c"
> > +#define SSB_OHCI_DRIVER		ssb_ohci_driver
> > +#endif
> 
> argh.  Why did USB do this?  Sigh.
> 
> >  #if	!defined(PCI_DRIVER) &&		\
> >  	!defined(PLATFORM_DRIVER) &&	\
> >  	!defined(OF_PLATFORM_DRIVER) &&	\
> >  	!defined(SA1111_DRIVER) &&	\
> > -	!defined(PS3_SYSTEM_BUS_DRIVER)
> > +	!defined(PS3_SYSTEM_BUS_DRIVER) && \
> > +	!defined(SSB_OHCI_DRIVER)
> >  #error "missing bus glue for ohci-hcd"
> >  #endif
> >  
> > @@ -972,10 +978,20 @@ static int __init ohci_hcd_mod_init(void
> >  		goto error_pci;
> >  #endif
> >  
> > +#ifdef SSB_OHCI_DRIVER
> > +	retval = ssb_driver_register(&SSB_OHCI_DRIVER);
> > +	if (retval)
> > +		goto error_ssb;
> > +#endif
> 
> Why do we use SSB_OHCI_DRIVER here rather than ssb_ohci_driver?   Seems odd.

Yes, that ohci code is horrible. But all other ohci drivers do it this way, too,
so I did it, too.

> > +
> >  	return retval;
> >  
> >  	/* Error path */
> > +#ifdef SSB_OHCI_DRIVER
> > + error_ssb:
> > +#endif
> >  #ifdef PCI_DRIVER
> > +	pci_unregister_driver(&PCI_DRIVER);
> 
> hm, are you sure about this?  I don't see anywhere in here where PCI_DRIVER
> got newly registered, but we are newly unregistering it?

Whoops, good catch. That's a merge error.