Re: [PATCH 16/29] target/usb: Remove ifdeffed code

["Nicholas A. Bellinger" <nab@xxxxxxxxxxxxxxx>]

On Tue, 2012-04-10 at 20:41 +0200, Sebastian Andrzej Siewior wrote:
> On 04/07/2012 04:55 AM, Nicholas A. Bellinger wrote:

Hey Sebastian,

> > So with that bit out of the way, the next item on the org side would be
> > to go ahead and get target/usb-gadget merged into a single source file
> > and header following what has been done with loopback, tcm_qla2xxx and
> > friends.  Would you mind submitting a patch to take care of this in
> > lio-core at your earliest convenience..?
> 
> I though having the source split in logical units like uas/bot
> /usb/target specific is a good thing. However if you think that it is
> better to have everything in one single file then okay. It is not that
> huge.
> 

Having all fabric code in one source file is something that hch had
requested for the upstreaming modern fabric code.

For drivers beyond a certain size, this has historically not always been
a hard requirement to merge (look at iscsi-target and tcm-fc for
example), but looking at usb-gadget's current size:

  440 drivers/target/usb-gadget/bot.c
  507 drivers/target/usb-gadget/configfs.c
  622 drivers/target/usb-gadget/fabric.c
  533 drivers/target/usb-gadget/gadget.c
  102 drivers/target/usb-gadget/tcm_usb_gadget.mod.c
  433 drivers/target/usb-gadget/uas.c
  204 drivers/target/usb-gadget/usbg.h
 2841 total

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.

Thanks Sebastian!

--nab


--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html