Re: [RFC] Moving files around in drivers/net

[Jeff Kirsher <jeffrey.t.kirsher@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 6299 bytes --]

On Wed, 2011-06-15 at 20:34 -0700, Po-Yu Chuang wrote:
> Dear Joe,
> 
> On Thu, Jun 16, 2011 at 9:10 AM, Joe Perches <joe@perches.com> wrote:
> > On Wed, 2011-06-15 at 11:38 -0700, Jeff Kirsher wrote:
> >> On Wed, Jun 1, 2011 at 13:01, Joe Perches <joe@perches.com> wrote:
> >> > On Wed, 2011-06-01 at 12:53 -0700, Jeff Kirsher wrote:
> >> >> On Wed, 2011-06-01 at 12:30 -0700, Joe Perches wrote:
> >> >> > Does anyone still think moving files around in drivers/net
> >> >> > would be sensible and a suitable candidate for inclusion
> >> >> > in 3.1?
> >> >> > Here's what Jeffrey proposed:
> >> >> > http://vger.kernel.org/netconf2010_slides/netconf-jtk.pdf
> >> >> > Here's what I proposed before that.
> >> >> > http://www.spinics.net/lists/netdev/msg149717.html
> >> >> I am over 90% done with the work and have been trying to finish up the
> >> >> patches so that I could get them out as an RFC here in the next week.
> >> > Excellent, thanks.
> >> I thought for sure I would have finished what I have left by last
> >> weekend, but I keep getting interrupted.  (Blame it on the NHL stanley
> >> cup playoffs) :)
> >> I have created a git tree on kernel.org with all the work that I have
> >> completed so far (see below).  This first stage of the move is only
> >> taking care of the drivers.  The next stage will move the networking
> >> core drivers (bridging, bonding, vlan, etc.) into drivers/net/sw.
> >> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize
> >> I will send out all the patches as an RFC by the end of the week (for sure)
> >
> > I've put the body of the git log below my comments
> > to make it easier to discuss.
> >
> > Comments:
> >
> > pktgen in hamachi/yellowfin should be pkteng
> >
> > I think it might be better if:
> >
> > Things were more spelled out:
> >        pkteng should be packetengines
> > And things maybe not spelled out
> >        ixp2000 might just be ixp (what not intel?:)
> >
> > And maybe drivers/net/ethernet/ should be as
> > unpopulated as possible.  Maybe create a misc
> > directory and throw old unclassifiable junk there.
> >
> > Lance should be its own directory like 8390.
> > I think a2065 and ariadne are lance drivers.
> >
> > Some manufacturer directories are directly populated
> > with multiple drivers, some have subdirectories.
> > Should one style be consistently used?
> >
> > pch_gbe should probably be oki.
> >
> > Isn't syskonnect now marvell?
> >
> > stmmac may not be a good name.  Maybe stmicro.
> >
> > enic may not be a good name.  Maybe cisco.
> >
> > mlx4 may be mellanox
> >
> > sfc may be solarflare
> >
> > bna may be brocade
> >
> > cheers, Joe
> >
> 
> [snip...]
> 
> > commit 5fe875b9e93af6b5a099b37471bebb541f1ba0c6
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date:   Thu May 19 22:06:03 2011 -0700
> >
> >    arm: Move the ARM/ACORN drivers
> >
> >    Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> >    necessary Kconfig and Makefile changes.
> >    There were 4 drivers (TI Davinci & ftmac100) not in the
> >    drivers/net/arm/ which should have been since they are only supported
> >    under ARM, so they were added to the new directory structure.
> >
> >    NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> >    CC'ing the last 3 major contributors from TI.
> >
> >    CC: Sriram <srk@ti.com>
> >    CC: Vinay Hegde <vinay.hegde@ti.com>
> >    CC: Cyril Chemparathy <cyril@ti.com>
> >    CC: Russell King <linux@arm.linux.org.uk>
> >    CC: Wan ZongShun <mcuos.com@gmail.com>
> >    CC: Lennert Buytenhek <kernel@wantstofly.org>
> >    CC: Krzysztof Halasa <khc@pm.waw.pl>
> >    CC: Po-Yu Chuang <ratbert@faraday-tech.com>
> >    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> >  MAINTAINERS                                    |   10 +-
> >  drivers/net/Kconfig                            |   51 ---------
> >  drivers/net/Makefile                           |    7 --
> >  drivers/net/arm/Kconfig                        |   74 -------------
> >  drivers/net/ethernet/Kconfig                   |    1 +
> >  drivers/net/ethernet/Makefile                  |    1 +
> >  drivers/net/ethernet/arm/Kconfig               |  138 ++++++++++++++++++++++++
> >  drivers/net/{ => ethernet}/arm/Makefile        |    6 +-
> >  drivers/net/{ => ethernet}/arm/am79c961a.c     |    0
> >  drivers/net/{ => ethernet}/arm/am79c961a.h     |    0
> >  drivers/net/{ => ethernet}/arm/at91_ether.c    |    0
> >  drivers/net/{ => ethernet}/arm/at91_ether.h    |    0
> >  drivers/net/{ => ethernet/arm}/davinci_cpdma.c |    0
> >  drivers/net/{ => ethernet/arm}/davinci_cpdma.h |    0
> >  drivers/net/{ => ethernet/arm}/davinci_emac.c  |    0
> >  drivers/net/{ => ethernet/arm}/davinci_mdio.c  |    0
> >  drivers/net/{ => ethernet}/arm/ep93xx_eth.c    |    0
> >  drivers/net/{ => ethernet}/arm/ether1.c        |    0
> >  drivers/net/{ => ethernet}/arm/ether1.h        |    0
> >  drivers/net/{ => ethernet}/arm/ether3.c        |    0
> >  drivers/net/{ => ethernet}/arm/ether3.h        |    0
> >  drivers/net/{ => ethernet}/arm/etherh.c        |    0
> >  drivers/net/{ => ethernet/arm}/ftgmac100.c     |    0
> >  drivers/net/{ => ethernet/arm}/ftgmac100.h     |    0
> >  drivers/net/{ => ethernet/arm}/ftmac100.c      |    0
> >  drivers/net/{ => ethernet/arm}/ftmac100.h      |    0
> >  drivers/net/{ => ethernet}/arm/ixp4xx_eth.c    |    0
> >  drivers/net/{ => ethernet}/arm/ks8695net.c     |    0
> >  drivers/net/{ => ethernet}/arm/ks8695net.h     |    0
> >  drivers/net/{ => ethernet}/arm/w90p910_ether.c |    0
> >  30 files changed, 150 insertions(+), 138 deletions(-)
> >
> 
> [snip...]
> 
> Faraday ftmac100 and ftgmac100 are used by not only ARM SoCs.
> There are SoCs of NDS32 architecture use these controllers, but
> NDS32 architecture is not in Linux mainline (yet).
> If these drivers were moved to arm directory, they maybe need to be
> moved out of it someday.
> 
> So, how about:
> driver/net{ => ethernet/faraday}/ftmac100.c
> driver/net{ => ethernet/faraday}/ftgmac100.c
> 
> Best regards,
> Po-Yu Chuang

That sounds fine, I will make the change.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]