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> --- drivers/usb/musb/musb_core.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 27dadc0..2b04f07 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2120,12 +2120,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 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) - musb->io.ep_offset = musb->ops->ep_offset; - if (musb->ops->ep_select) - musb->io.ep_select = musb->ops->ep_select; - if (musb->ops->fifo_mode) fifo_mode = musb->ops->fifo_mode; else -- 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