]> git.sur5r.net Git - u-boot/commitdiff
usb: ehci-vf: use ehci_deregister() for .remove callback
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Fri, 14 Oct 2016 01:29:37 +0000 (10:29 +0900)
committerMarek Vasut <marex@denx.de>
Thu, 27 Oct 2016 06:02:36 +0000 (08:02 +0200)
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 <yamada.masahiro@socionext.com>
drivers/usb/host/ehci-vf.c

index f6f9efb6cdaf890a00a8a04574547f4a7223bb66..f389bff1718f09b7f5f979907e48cfcc48e307f2 100644 (file)
@@ -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),