linux-next: manual merge of the usb-gadget tree with the tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1960 bytes --]

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/chipidea/udc.c between commit adf0f735e61a ("usb: chipidea:
move debug files creation/removal to the core") from the usb tree and
commit dc9e2873b740 ("usb: chipidea: let udc-core manage gadget->dev")
from the usb-gadget tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/chipidea/udc.c
index e502e48,9bddf3f..0000000
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@@ -1700,19 -1742,18 +1684,13 @@@ static int udc_start(struct ci13xxx *ci
  		retval = hw_device_reset(ci, USBMODE_CM_DC);
  		if (retval)
  			goto put_transceiver;
 -		hw_enable_vbus_intr(ci);
  	}
  
- 	retval = device_register(&ci->gadget.dev);
- 	if (retval) {
- 		put_device(&ci->gadget.dev);
- 		goto put_transceiver;
- 	}
- 
 -	retval = dbg_create_files(ci->dev);
 -	if (retval)
 -		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 remove_dbg;
++			goto put_transceiver;
  	}
  
  	retval = usb_add_gadget_udc(dev, &ci->gadget);
@@@ -1732,8 -1773,8 +1710,6 @@@ remove_trans
  	}
  
  	dev_err(dev, "error = %i\n", retval);
- unreg_device:
- 	device_unregister(&ci->gadget.dev);
 -remove_dbg:
 -	dbg_remove_files(ci->dev);
  put_transceiver:
  	if (!IS_ERR_OR_NULL(ci->transceiver) && ci->global_phy)
  		usb_put_phy(ci->transceiver);
@@@ -1768,7 -1812,7 +1744,6 @@@ static void udc_stop(struct ci13xxx *ci
  		if (ci->global_phy)
  			usb_put_phy(ci->transceiver);
  	}
- 	device_unregister(&ci->gadget.dev);
 -	dbg_remove_files(ci->dev);
  	/* my kobject is dynamic, I swear! */
  	memset(&ci->gadget, 0, sizeof(ci->gadget));
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]