From: Masahiro Yamada Date: Fri, 14 Oct 2016 01:29:37 +0000 (+0900) Subject: usb: ehci-vf: use ehci_deregister() for .remove callback X-Git-Tag: v2016.11-rc3~19^2~2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=99e2df47c4edc2286c4614daf4a82fe1e7a4e4b0;p=oweals%2Fu-boot.git usb: ehci-vf: use ehci_deregister() for .remove callback This driver was recently converted to Driver Model, so missed the subsystem-wide cleanups by commit 405273427366 ("usb: replace ehci_*_remove() with usb_deregister()"). Signed-off-by: Masahiro Yamada --- diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c index f6f9efb6cd..f389bff171 100644 --- a/drivers/usb/host/ehci-vf.c +++ b/drivers/usb/host/ehci-vf.c @@ -339,17 +339,6 @@ static int ehci_usb_probe(struct udevice *dev) return ehci_register(dev, hccr, hcor, &vf_ehci_ops, 0, priv->init_type); } -static int ehci_usb_remove(struct udevice *dev) -{ - int ret; - - ret = ehci_deregister(dev); - if (ret) - return ret; - - return 0; -} - static const struct udevice_id vf_usb_ids[] = { { .compatible = "fsl,vf610-usb" }, { } @@ -361,7 +350,7 @@ U_BOOT_DRIVER(usb_ehci) = { .of_match = vf_usb_ids, .bind = vf_usb_bind, .probe = ehci_usb_probe, - .remove = ehci_usb_remove, + .remove = ehci_deregister, .ops = &ehci_usb_ops, .ofdata_to_platdata = vf_usb_ofdata_to_platdata, .platdata_auto_alloc_size = sizeof(struct usb_platdata),