On Thu, 2012-04-12 at 21:23 -0700, Nicholas A. Bellinger wrote:
> On Tue, 2012-04-10 at 23:36 -0700, Nicholas A. Bellinger wrote:
> > On Tue, 2012-04-10 at 20:41 +0200, Sebastian Andrzej Siewior wrote:
> > > On 04/07/2012 04:55 AM, Nicholas A. Bellinger wrote:
> >
>
> <SNIP>
>
> > I really don't have a strong opinion here either way, but it would be
> > nice for consistency and grok-abilities sake to go ahead and merge it
> > down into a single source + header file it's current size (~2700 LOC)..
> >
> > > >> From there things are ready to start dropping into for-next for a
> > > > v3.5-rc merge candidate if there are no other objections from the USB
> > > > folks. 8-)
> > >
> > > What happened to the v3.4 merge window? Were you missing ACKs or just
> > > busy that you were not able to prepare a pull?
> > >
> >
> > I've had my hands full with qla2xxx target mode, and did not have a
> > chance to get this code into for-next in time for a v3.4-rc1 merge..
> >
> > Given the extra time it makes sense to go ahead and do the re-org now
> > ahead of dropping into for-next. So please go ahead and send me that
> > re-org patch against lio-core.git HEAD, and I'll copy over the end
> > result into a for-next commit for your review.
> >
>
> Hey Sebastian,
>
> Could you take care of this in the next couple of days so we can get
> this ready into this upcoming sunday's linux-next build..?
>
> If not, I'm OK with doing the conversion to a single source/header in
> the next days myself if you're currently busy with other items..
>
Hi Sebastian & USB folks,
Being eager to get this into sunday's next build, here is my current
usb-gadget conversion branch:
git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core.git usb-gadget-merge
It makes the mechanical changes for drivers/target/usb-gadget/ to use a
single usb_gadget.[c,h] source/header file following mainline convention
for new target fabric drivers.
All of the functions have been statically defined and added inline
prototypes where necessary.
This patch also renames the tcm_usb_gadget.ko config entry from:
TARGET_USB_GADGET -> TCM_USB_GADGET
for kconfig consistency purposes. The diffstat ends up looking like:
drivers/target/usb-gadget/Makefile | 8 +-
drivers/target/usb-gadget/bot.c | 440 ------
drivers/target/usb-gadget/configfs.c | 507 -------
drivers/target/usb-gadget/fabric.c | 619 --------
drivers/target/usb-gadget/gadget.c | 533 -------
drivers/target/usb-gadget/uas.c | 433 ------
drivers/target/usb-gadget/usb_gadget.c | 2480 ++++++++++++++++++++++++++++++++
drivers/target/usb-gadget/usb_gadget.h | 146 ++
drivers/target/usb-gadget/usbg.h | 204 ---
9 files changed, 2628 insertions(+), 2742 deletions(-)
delete mode 100644 drivers/target/usb-gadget/bot.c
delete mode 100644 drivers/target/usb-gadget/configfs.c
delete mode 100644 drivers/target/usb-gadget/fabric.c
delete mode 100644 drivers/target/usb-gadget/gadget.c
delete mode 100644 drivers/target/usb-gadget/uas.c
create mode 100644 drivers/target/usb-gadget/usb_gadget.c
create mode 100644 drivers/target/usb-gadget/usb_gadget.h
delete mode 100644 drivers/target/usb-gadget/usbg.h
Please have a look at this branch over the next days, and if you're OK
with the re-org changes I'll go ahead and merge this into
lio-core/master, and drop into target-pending for sunday night's build.
Thanks Sebastian!
--nab
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
