|
@@ -128,12 +128,7 @@ MODULE_ALIAS("platform:" MUSB_DRIVER_NAME);
|
|
|
|
|
|
static inline struct musb *dev_to_musb(struct device *dev)
|
|
|
{
|
|
|
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
|
|
|
- /* usbcore insists dev->driver_data is a "struct hcd *" */
|
|
|
- return hcd_to_musb(dev_get_drvdata(dev));
|
|
|
-#else
|
|
|
return dev_get_drvdata(dev);
|
|
|
-#endif
|
|
|
}
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
@@ -1876,10 +1871,9 @@ allocate_instance(struct device *dev,
|
|
|
musb = kzalloc(sizeof *musb, GFP_KERNEL);
|
|
|
if (!musb)
|
|
|
return NULL;
|
|
|
- dev_set_drvdata(dev, musb);
|
|
|
|
|
|
#endif
|
|
|
-
|
|
|
+ dev_set_drvdata(dev, musb);
|
|
|
musb->mregs = mbase;
|
|
|
musb->ctrl_base = mbase;
|
|
|
musb->nIrq = -ENODEV;
|