Skip to contentSkip to conversation

usb: musb: remove duplicated actions

PATCH Applied Kirill Esipov 2 participants 2 messages Oct 26, 2016 – Nov 1, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 usb: musb: remove duplicated actions

Removing unnecessary duplicated actions that we've got while merging:
19915e623458 ("Merge 4.1-rc7 into usb-next")

---
 drivers/usb/musb/musb_core.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/usb/musb/musb_core.c +0 -5
index 27dadc0..e01116e 100644
@@ -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)
Signature · 1 line
2.7.4
maintainer Applied
#1 lore raw

Hi,

Quoted 4 lines · Kirill Esipov

Removing unnecessary duplicated actions that we've got while merging:
19915e623458 ("Merge 4.1-rc7 into usb-next")

Applied. Thanks.

Regards,
-Bin.

Quoted 23 lines
---
 drivers/usb/musb/musb_core.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/usb/musb/musb_core.c +0 -5
index 27dadc0..e01116e 100644
@@ -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)
Signature · 1 line
2.7.4