diff options
author | Tom Rini <trini@konsulko.com> | 2016-10-29 17:15:37 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-10-29 17:15:37 -0400 |
commit | 30aaa774df39971e0f488b7661c8825a45570cd2 (patch) | |
tree | 45f4d86b3a2f3e3b69140079636144512885a270 /drivers/usb/host/xhci-mvebu.c | |
parent | 9f375f655fa54f88fdbe35d3f0c3bd6c1a91671b (diff) | |
parent | 57faca19a82fc9b43a227824c30aeb76a43d1957 (diff) | |
download | u-boot-imx-30aaa774df39971e0f488b7661c8825a45570cd2.zip u-boot-imx-30aaa774df39971e0f488b7661c8825a45570cd2.tar.gz u-boot-imx-30aaa774df39971e0f488b7661c8825a45570cd2.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/usb/host/xhci-mvebu.c')
-rw-r--r-- | drivers/usb/host/xhci-mvebu.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index 23c241a..46eb937 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -56,11 +56,6 @@ static int xhci_usb_probe(struct udevice *dev) return xhci_register(dev, ctx->hcd, hcor); } -static int xhci_usb_remove(struct udevice *dev) -{ - return xhci_deregister(dev); -} - static int xhci_usb_ofdata_to_platdata(struct udevice *dev) { struct mvebu_xhci_platdata *plat = dev_get_platdata(dev); @@ -89,7 +84,7 @@ U_BOOT_DRIVER(usb_xhci) = { .of_match = xhci_usb_ids, .ofdata_to_platdata = xhci_usb_ofdata_to_platdata, .probe = xhci_usb_probe, - .remove = xhci_usb_remove, + .remove = xhci_deregister, .ops = &xhci_usb_ops, .platdata_auto_alloc_size = sizeof(struct mvebu_xhci_platdata), .priv_auto_alloc_size = sizeof(struct mvebu_xhci), |