1 files changed, 1 insertions, 26 deletions

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 3d90e6189731..519ead2443c5 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1639,16 +1639,6 @@ static irqreturn_t udc_irq(struct ci13xxx *ci)
 }
 
 /**
- * udc_release: driver release function
- * @dev: device
- *
- * Currently does nothing
- */
-static void udc_release(struct device *dev)
-{
-}
-
-/**
  * udc_start: initialize gadget role
  * @ci: chipidea controller
  */
@@ -1667,12 +1657,6 @@ static int udc_start(struct ci13xxx *ci)
 
         INIT_LIST_HEAD(&ci->gadget.ep_list);
 
-        dev_set_name(&ci->gadget.dev, "gadget");
-        ci->gadget.dev.dma_mask = dev->dma_mask;
-        ci->gadget.dev.coherent_dma_mask = dev->coherent_dma_mask;
-        ci->gadget.dev.parent   = dev;
-        ci->gadget.dev.release  = udc_release;
-
         /* alloc resources */
         ci->qh_pool = dma_pool_create("ci13xxx_qh", dev,
                                        sizeof(struct ci13xxx_qh),
@@ -1710,17 +1694,11 @@ static int udc_start(struct ci13xxx *ci)
                         goto put_transceiver;
         }
 
-        retval = device_register(&ci->gadget.dev);
-        if (retval) {
-                put_device(&ci->gadget.dev);
-                goto put_transceiver;
-        }
-
         if (!IS_ERR_OR_NULL(ci->transceiver)) {
                 retval = otg_set_peripheral(ci->transceiver->otg,
                                                 &ci->gadget);
                 if (retval)
-                        goto unreg_device;
+                        goto put_transceiver;
         }
 
         retval = usb_add_gadget_udc(dev, &ci->gadget);
@@ -1740,8 +1718,6 @@ remove_trans:
         }
 
         dev_err(dev, "error = %i\n", retval);
-unreg_device:
-        device_unregister(&ci->gadget.dev);
 put_transceiver:
         if (!IS_ERR_OR_NULL(ci->transceiver) && ci->global_phy)
                 usb_put_phy(ci->transceiver);
@@ -1776,7 +1752,6 @@ static void udc_stop(struct ci13xxx *ci)
                 if (ci->global_phy)
                         usb_put_phy(ci->transceiver);
         }
-        device_unregister(&ci->gadget.dev);
         /* my kobject is dynamic, I swear! */
         memset(&ci->gadget, 0, sizeof(ci->gadget));
 }