diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-05 15:18:00 -0700 | 
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-05 15:18:00 -0700 | 
| commit | 64dc9e2e7320f079b97c46b106133b58b8e18d40 (patch) | |
| tree | ab010dc1337d44e29c2b32b7f11788620a91fe4f /drivers/usb/gadget/s3c-hsudc.c | |
| parent | 01a60e76b6392547ad3dca3ac05b9c886fa5da45 (diff) | |
| parent | 9b192de60b5a584ee4ed967fb6758773c75e4643 (diff) | |
| download | olio-linux-3.10-64dc9e2e7320f079b97c46b106133b58b8e18d40.tar.xz olio-linux-3.10-64dc9e2e7320f079b97c46b106133b58b8e18d40.zip  | |
Merge tag 'usb-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: patches for v3.10 merge window
Here is the big Gadget & PHY pull request. Many of us have
been really busy lately getting multiple drivers to a better
position.
Since this pull request is so large, I will divide it in sections
so it's easier to grasp what's included.
- cleanups:
	. UDC drivers no longer touch gadget->dev, that's now udc-core
		responsibility
	. Many more UDC drivers converted to usb_gadget_map/unmap_request()
	. UDC drivers no longer initialize DMA-related fields from gadget's
		device structure
	. UDC drivers don't touch gadget.dev.driver directly
	. UDC drivers don't assign gadget.dev.release directly
	. Removal of some unused DMA_ADDR_INVALID
	. Introduction of CONFIG_USB_PHY
	. All phy drivers have been moved to drivers/usb/phy and renamed to
		a common naming scheme
	. Fix PHY layer so it never returns a NULL pointer, also fix all
		callers to avoid using IS_ERR_OR_NULL()
	. Sparse fixes all over the place
	. drivers/usb/otg/ has been deleted
	. Marvel drivers (mv_udc, ehci-mv, mv_otg and mv_u3d) improved clock
		usage
- new features:
	. UDC core now provides a generic way for tracking and reporting
		UDC's state (not attached, resuming, suspended, addressed,
		default, etc)
	. twl4030-usb learned that it shouldn't be enabled during init
	. Full DT support for DWC3 has been implemented
	. ab8500-usb learned about pinctrl framework
	. nop PHY learned about DeviceTree and regulators
	. DWC3 learned about suspend/resume
	. DWC3 can now be compiled in host-only and gadget-only (as well as
		DRD) configurations
	. UVC now enables streaming endpoint based on negotiated speed
	. isp1301 now implements the PHY API properly
	. configfs-based interface for gadget drivers which will lead to
		the removal of all code which just combines functions together
		to build functional gadget drivers.
	. f_serial and f_obex were converted to new configfs interface while
		maintaining old interface around.
- non-critical fixes:
	. UVC gadget driver got fixes for Endpoint usage and stream calculation
	. ab8500-usb fixed unbalanced clock and regulator API usage
	. twl4030-usb got a fix for when OMAP3 is booted with cable connected
	. fusb300_udc got a fix for DMA usage
	. UVC got fixes for two assertions of the USB Video Class Compliance
		specification revision 1.1
	. build warning issues caused by recent addition of __must_check to
		regulator API
These are all changes which deserve a mention, all other changes are related
to these one or minor spelling fixes and other similar tasks.
Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/s3c-hsudc.c')
| -rw-r--r-- | drivers/usb/gadget/s3c-hsudc.c | 16 | 
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c index 458965a1b13..b1f0771fbd3 100644 --- a/drivers/usb/gadget/s3c-hsudc.c +++ b/drivers/usb/gadget/s3c-hsudc.c @@ -283,7 +283,6 @@ static void s3c_hsudc_nuke_ep(struct s3c_hsudc_ep *hsep, int status)  /**   * s3c_hsudc_stop_activity - Stop activity on all endpoints.   * @hsudc: Device controller for which EP activity is to be stopped. - * @driver: Reference to the gadget driver which is currently active.   *   * All the endpoints are stopped and any pending transfer requests if any on   * the endpoint are terminated. @@ -1154,7 +1153,6 @@ static int s3c_hsudc_start(struct usb_gadget *gadget,  		return -EBUSY;  	hsudc->driver = driver; -	hsudc->gadget.dev.driver = &driver->driver;  	ret = regulator_bulk_enable(ARRAY_SIZE(hsudc->supplies),  				    hsudc->supplies); @@ -1190,7 +1188,6 @@ err_otg:  	regulator_bulk_disable(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);  err_supplies:  	hsudc->driver = NULL; -	hsudc->gadget.dev.driver = NULL;  	return ret;  } @@ -1208,7 +1205,6 @@ static int s3c_hsudc_stop(struct usb_gadget *gadget,  	spin_lock_irqsave(&hsudc->lock, flags);  	hsudc->driver = NULL; -	hsudc->gadget.dev.driver = NULL;  	hsudc->gadget.speed = USB_SPEED_UNKNOWN;  	s3c_hsudc_uninit_phy(); @@ -1303,15 +1299,10 @@ static int s3c_hsudc_probe(struct platform_device *pdev)  	spin_lock_init(&hsudc->lock); -	dev_set_name(&hsudc->gadget.dev, "gadget"); -  	hsudc->gadget.max_speed = USB_SPEED_HIGH;  	hsudc->gadget.ops = &s3c_hsudc_gadget_ops;  	hsudc->gadget.name = dev_name(dev); -	hsudc->gadget.dev.parent = dev; -	hsudc->gadget.dev.dma_mask = dev->dma_mask;  	hsudc->gadget.ep0 = &hsudc->ep[0].ep; -  	hsudc->gadget.is_otg = 0;  	hsudc->gadget.is_a_peripheral = 0;  	hsudc->gadget.speed = USB_SPEED_UNKNOWN; @@ -1345,12 +1336,6 @@ static int s3c_hsudc_probe(struct platform_device *pdev)  	disable_irq(hsudc->irq);  	local_irq_enable(); -	ret = device_register(&hsudc->gadget.dev); -	if (ret) { -		put_device(&hsudc->gadget.dev); -		goto err_add_device; -	} -  	ret = usb_add_gadget_udc(&pdev->dev, &hsudc->gadget);  	if (ret)  		goto err_add_udc; @@ -1359,7 +1344,6 @@ static int s3c_hsudc_probe(struct platform_device *pdev)  	return 0;  err_add_udc: -	device_unregister(&hsudc->gadget.dev);  err_add_device:  	clk_disable(hsudc->uclk);  err_res:  |