Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7135f08e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'gadget-for-v3.7' of... 

Merge tag 'gadget-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

usb: gadget: patches for v3.7 merge window

This pull request is large but the biggest part is the first part
of the cleanup on the gadget framework so we have a saner setup
to add configfs support for v3.8.

We have also some more conversions to the new udc_start/udc_stop
which makes us closer from dropping the old interfaces.

USB_GADGET_DUALSPEED and USB_GADGET_SUPERSPEED are finally gone,
thanks to Michal for his awesome work.

Other than that, we have the usual set of miscellaneous changes
and cleanups involving improvements to debug messages, removal
of duplicated includes, moving dereference after NULL test,
making renesas_hsbhs' irq handler Shared, unused code being dropped,
prevention of sleep-inside-spinlock bugs and a race condition fix
on udc-core.
parents 73d40660 5c4d46eb

drivers/staging/ccg/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -17,4 +17,9 @@ config USB_G_CCG 
	  Configurable Composite Gadget can be compiled "M" only

	  or not at all.



	  BIG FAT NOTE: DON'T RELY ON THIS USERINTERFACE HERE! AS PART

	  OF THE REWORK DONE HERE WILL BE A NEW USER INTERFACE WITHOUT ANY

	  COMPATIBILITY TO THIS SYSFS INTERFACE HERE. BE AWARE OF THIS

	  BEFORE SELECTING THIS.



endif # USB_GADGET

drivers/staging/ccg/Makefile

+0 −2
Original line number Diff line number Diff line 
g_ccg-y				:= ccg.o

ccflags-y			+= -Idrivers/usb/gadget



obj-$(CONFIG_USB_G_CCG)		+= g_ccg.o

drivers/staging/ccg/ccg.c

+15 −14
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <linux/platform_device.h>



#include <linux/usb/ch9.h>

#include <linux/usb/composite.h>

#include "composite.h"

#include <linux/usb/gadget.h>



#include "gadget_chips.h"
@@ -44,19 +44,19 @@ 
 * the runtime footprint, and giving us at least some parts of what

 * a "gcc --combine ... part1.c part2.c part3.c ... " build would.

 */

#include "../../usb/gadget/usbstring.c"

#include "../../usb/gadget/config.c"

#include "../../usb/gadget/epautoconf.c"

#include "../../usb/gadget/composite.c"



#include "../../usb/gadget/f_mass_storage.c"

#include "../../usb/gadget/u_serial.c"

#include "../../usb/gadget/f_acm.c"

#include "usbstring.c"

#include "config.c"

#include "epautoconf.c"

#include "composite.c"



#include "f_mass_storage.c"

#include "u_serial.c"

#include "f_acm.c"

#define USB_ETH_RNDIS y

#include "../../usb/gadget/f_rndis.c"

#include "../../usb/gadget/rndis.c"

#include "../../usb/gadget/u_ether.c"

#include "../../usb/gadget/f_fs.c"

#include "f_rndis.c"

#include "rndis.c"

#include "u_ether.c"

#include "f_fs.c"



MODULE_AUTHOR("Mike Lockwood, Andrzej Pietrasiewicz");

MODULE_DESCRIPTION("Configurable Composite USB Gadget");
@@ -1162,6 +1162,7 @@ static int ccg_usb_unbind(struct usb_composite_dev *cdev) 
static struct usb_composite_driver ccg_usb_driver = {

	.name		= "configurable_usb",

	.dev		= &device_desc,

	.bind		= ccg_bind,

	.unbind		= ccg_usb_unbind,

	.needs_serial	= true,

	.iManufacturer	= "Linux Foundation",
@@ -1275,7 +1276,7 @@ static int __init init(void) 
	composite_driver.setup = ccg_setup;

	composite_driver.disconnect = ccg_disconnect;



	err = usb_composite_probe(&ccg_usb_driver, ccg_bind);

	err = usb_composite_probe(&ccg_usb_driver);

	if (err) {

		class_destroy(ccg_class);

		kfree(dev);