Hi, On Wed, Oct 26, 2016 at 09:10:07PM +0300, Kirill Esipov wrote: > Removing unnecessary duplicated actions that we've got while merging: > 19915e623458 ("Merge 4.1-rc7 into usb-next") > > Signed-off-by: Kirill Esipov <yesipov@xxxxxxxxx> Applied. Thanks. Regards, -Bin. > --- > drivers/usb/musb/musb_core.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c > index 27dadc0..e01116e 100644 > --- a/drivers/usb/musb/musb_core.c > +++ b/drivers/usb/musb/musb_core.c > @@ -2114,11 +2114,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) > musb->io.ep_offset = musb_flat_ep_offset; > musb->io.ep_select = musb_flat_ep_select; > } > - /* And override them with platform specific ops if specified. */ > - if (musb->ops->ep_offset) > - musb->io.ep_offset = musb->ops->ep_offset; > - if (musb->ops->ep_select) > - musb->io.ep_select = musb->ops->ep_select; > > /* At least tusb6010 has its own offsets */ > if (musb->ops->ep_offset) > -- > 2.7.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html