usb: gadget: libcomposite: move composite.c into libcomposite (721e2e91) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/gadget/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,8 @@ ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG

		obj-$(CONFIG_USB_GADGET) += udc-core.o
		obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o
		libcomposite-y := usbstring.o config.o epautoconf.o gadget_chips.o
		libcomposite-y := usbstring.o config.o epautoconf.o
		libcomposite-y += gadget_chips.o composite.o
		obj-$(CONFIG_USB_DUMMY_HCD) += dummy_hcd.o
		obj-$(CONFIG_USB_NET2272) += net2272.o
		obj-$(CONFIG_USB_NET2280) += net2280.o

drivers/usb/gadget/acm_ms.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/

		#include <linux/kernel.h>
		#include <linux/module.h>

		#include "u_serial.h"

		@@ -40,7 +41,6 @@
		* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
		*/

		#include "composite.c"
		#include "u_serial.c"
		#include "f_acm.c"
		#include "f_mass_storage.c"

drivers/usb/gadget/audio.c

+1 −10

Original line number	Diff line number	Diff line
		@@ -12,22 +12,13 @@
		/* #define VERBOSE_DEBUG */

		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/usb/composite.h>

		#include "gadget_chips.h"
		#define DRIVER_DESC "Linux USB Audio Gadget"
		#define DRIVER_VERSION "Feb 2, 2012"

		/-------------------------------------------------------------------------/

		/*
		* Kbuild is not very cooperative with respect to linking separately
		* compiled library objects into one module. So for now we won't use
		* separate compilation ... ensuring init/exit sections work to shrink
		* the runtime footprint, and giving us at least some parts of what
		* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
		*/
		#include "composite.c"
		USB_GADGET_COMPOSITE_OPTIONS();

		/* string IDs are assigned dynamically */

drivers/usb/gadget/cdc2.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ USB_GADGET_COMPOSITE_OPTIONS();
		* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
		*/

		#include "composite.c"
		#include "u_serial.c"
		#include "f_acm.c"
		#include "f_ecm.c"

drivers/usb/gadget/composite.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ ep_found:
		}
		return 0;
		}
		EXPORT_SYMBOL_GPL(config_ep_by_speed);

		/**
		* usb_add_function() - add a function to a configuration
		@@ -212,6 +213,7 @@ done:
		function->name, function, value);
		return value;
		}
		EXPORT_SYMBOL_GPL(usb_add_function);

		/**
		* usb_function_deactivate - prevent function and gadget enumeration
		@@ -248,6 +250,7 @@ int usb_function_deactivate(struct usb_function *function)
		spin_unlock_irqrestore(&cdev->lock, flags);
		return status;
		}
		EXPORT_SYMBOL_GPL(usb_function_deactivate);

		/**
		* usb_function_activate - allow function and gadget enumeration
		@@ -278,6 +281,7 @@ int usb_function_activate(struct usb_function *function)
		spin_unlock_irqrestore(&cdev->lock, flags);
		return status;
		}
		EXPORT_SYMBOL_GPL(usb_function_activate);

		/**
		* usb_interface_id() - allocate an unused interface ID
		@@ -314,6 +318,7 @@ int usb_interface_id(struct usb_configuration *config,
		}
		return -ENODEV;
		}
		EXPORT_SYMBOL_GPL(usb_interface_id);

		static int config_buf(struct usb_configuration *config,
		enum usb_device_speed speed, void *buf, u8 type)
		@@ -754,6 +759,7 @@ done:
		config->bConfigurationValue, status);
		return status;
		}
		EXPORT_SYMBOL_GPL(usb_add_config);

		static void remove_config(struct usb_composite_dev *cdev,
		struct usb_configuration *config)
		@@ -947,6 +953,7 @@ int usb_string_id(struct usb_composite_dev *cdev)
		}
		return -ENODEV;
		}
		EXPORT_SYMBOL_GPL(usb_string_id);

		/**
		* usb_string_ids() - allocate unused string IDs in batch
		@@ -978,6 +985,7 @@ int usb_string_ids_tab(struct usb_composite_dev cdev, struct usb_string str)

		return 0;
		}
		EXPORT_SYMBOL_GPL(usb_string_ids_tab);

		/**
		* usb_string_ids_n() - allocate unused string IDs in batch
		@@ -1006,7 +1014,7 @@ int usb_string_ids_n(struct usb_composite_dev *c, unsigned n)
		c->next_string_id += n;
		return next + 1;
		}

		EXPORT_SYMBOL_GPL(usb_string_ids_n);

		/-------------------------------------------------------------------------/

		@@ -1572,6 +1580,7 @@ int usb_composite_probe(struct usb_composite_driver *driver)

		return usb_gadget_probe_driver(gadget_driver);
		}
		EXPORT_SYMBOL_GPL(usb_composite_probe);

		/**
		* usb_composite_unregister() - unregister a composite driver
		@@ -1584,6 +1593,7 @@ void usb_composite_unregister(struct usb_composite_driver *driver)
		{
		usb_gadget_unregister_driver(&driver->gadget_driver);
		}
		EXPORT_SYMBOL_GPL(usb_composite_unregister);

		/**
		* usb_composite_setup_continue() - Continue with the control transfer
		@@ -1620,6 +1630,7 @@ void usb_composite_setup_continue(struct usb_composite_dev *cdev)

		spin_unlock_irqrestore(&cdev->lock, flags);
		}
		EXPORT_SYMBOL_GPL(usb_composite_setup_continue);

		static char composite_default_mfr(struct usb_gadget gadget)
		{
		@@ -1672,3 +1683,4 @@ void usb_composite_overwrite_options(struct usb_composite_dev *cdev,
		dev_str[USB_GADGET_PRODUCT_IDX].s = covr->product;
		}
		}
		EXPORT_SYMBOL_GPL(usb_composite_overwrite_options);