Hi, On Tue, Jun 21, 2011 at 03:47:04PM +0400, Sergei Shtylyov wrote: > Hello. > > On 21-06-2011 11:03, p.paneri@xxxxxxxxxxx wrote: > > >From: Praveen Paneri<p.paneri@xxxxxxxxxxx> > > >Adding dwc driver name in existing platform device > >to probe DWC OTG driver. > >Introduced otg_set_platdata function to pass platform data > >Added selectable config option to add DWC OTG driver for different > >machines. > > >Signed-off-by: Praveen Paneri<p.paneri@xxxxxxxxxxx> > [...] > > >diff --git a/arch/arm/plat-samsung/dev-usb-hsotg.c b/arch/arm/plat-samsung/dev-usb-hsotg.c > >index 33a844a..7e6228b 100644 > >--- a/arch/arm/plat-samsung/dev-usb-hsotg.c > >+++ b/arch/arm/plat-samsung/dev-usb-hsotg.c > [...] > >@@ -37,7 +39,12 @@ static struct resource s3c_usb_hsotg_resources[] = { > > static u64 s3c_hsotg_dmamask = DMA_BIT_MASK(32); > > > > struct platform_device s3c_device_usb_hsotg = { > >+#ifdef CONFIG_S3C_DEV_USB_HSOTG > > .name = "s3c-hsotg", > >+#endif > >+#ifdef CONFIG_S3C_DEV_DWC_OTG > >+ .name = "dwc_otg", > >+#endif > > I'd done it as: > > +#if defined(CONFIG_S3C_DEV_USB_HSOTG) > .name = "s3c-hsotg", > +#elif defined(CONFIG_S3C_DEV_DWC_OTG) > + .name = "dwc_otg", > +#endif no... don't do that. How many times do I have to repeat ? No ifdefs!! we want both drivers to be able to be compiled as modules, so add both platform devices. -- balbi
Attachment:
signature.asc
Description: Digital signature