From: Ajay Kumar Gupta Date: Fri, 31 Aug 2012 11:09:56 +0000 (+0000) Subject: usb: musb: dsps: remove explicit NOP device creation X-Git-Tag: v3.7-rc1~171^2~138^2 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=d8c3ef256f88b7c6ecd673d03073b5645be9c5e4;p=~andy%2Flinux usb: musb: dsps: remove explicit NOP device creation As NOP device node is now added in am33xx tree so remove the call which creates the NOP platform_device. Signed-off-by: Ajay Kumar Gupta Signed-off-by: Santhapuri, Damodar Signed-off-by: Ravi Babu Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c index b8aecbba740..2785e28ec4a 100644 --- a/drivers/usb/musb/musb_dsps.c +++ b/drivers/usb/musb/musb_dsps.c @@ -376,8 +376,7 @@ static int dsps_musb_init(struct musb *musb) /* mentor core register starts at offset of 0x400 from musb base */ musb->mregs += wrp->musb_core_offset; - /* NOP driver needs change if supporting dual instance */ - usb_nop_xceiv_register(); + /* Get the NOP PHY */ musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); if (IS_ERR_OR_NULL(musb->xceiv)) return -ENODEV;