diff options
| author | Kirill Esipov <yesipov@gmail.com> | 2016-11-01 21:47:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-07 10:10:25 +0100 |
| commit | 2e52ec2394fb9486fd496737a84d629b2c992db2 (patch) | |
| tree | badb8e502c2f9f529097f9e0797edbc6c6b2f03c /drivers | |
| parent | usb: musb: da8xx: Don't print phy error on -EPROBE_DEFER (diff) | |
| download | linux-2e52ec2394fb9486fd496737a84d629b2c992db2.tar.xz linux-2e52ec2394fb9486fd496737a84d629b2c992db2.zip | |
usb: musb: remove duplicated actions
Removing unnecessary duplicated actions that we've got while merging:
Commit 19915e623458 ("Merge 4.1-rc7 into usb-next")
[ b-liu@ti.com: added 'Commit' in the commit message ]
Signed-off-by: Kirill Esipov <yesipov@gmail.com>
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 27dadc0d9114..e01116e4c067 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) |