Home » Mailing list archives » linux-netdev » 2009 » March » 25

Re: [PATCH 15/61] net: struct device - replace bus_id with dev_name(), dev_set_name()

Previous thread: Re: netfilter spurious ELOOP by David Miller on Tuesday, March 24, 2009 - 4:28 pm. (5 messages)

Next thread: [net-next PATCH] e1000e: add support for 82574 device ID 0x10F6 by Jeff Kirsher on Tuesday, March 24, 2009 - 6:32 pm. (2 messages)
[view original message]
From: Greg Kroah-Hartman
Subject: [PATCH 15/61] net: struct device - replace bus_id with dev_name(), dev_set_name()
Date: Tuesday, March 24, 2009 - 5:26 pm

From: Kay Sievers <kay.sievers@vrfy.org>

Cc: davem@davemloft.net
Cc: netdev@vger.kernel.org
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
---
 drivers/net/arm/ks8695net.c  |    2 +-
 drivers/net/au1000_eth.c     |    8 ++++----
 drivers/net/bfin_mac.c       |   12 ++++++------
 drivers/net/bmac.c           |    2 +-
 drivers/net/cpmac.c          |    2 +-
 drivers/net/declance.c       |    6 +++---
 drivers/net/depca.c          |    6 +++---
 drivers/net/ehea/ehea_main.c |    2 +-
 drivers/net/jazzsonic.c      |    6 ++++--
 drivers/net/macb.c           |   10 +++++-----
 drivers/net/macsonic.c       |   15 ++++++++-------
 drivers/net/mv643xx_eth.c    |    2 +-
 drivers/net/sb1250-mac.c     |   10 +++++-----
 drivers/net/smc911x.c        |    2 +-
 drivers/net/smc91x.c         |    2 +-
 drivers/net/smsc911x.c       |    7 ++++---
 drivers/net/smsc9420.c       |    4 ++--
 drivers/net/tc35815.c        |    4 ++--
 drivers/net/xtsonic.c        |    2 +-
 19 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index f3a1274..35cd264 100644
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -1059,7 +1059,7 @@ ks8695_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *info)
 {
 	strlcpy(info->driver, MODULENAME, sizeof(info->driver));
 	strlcpy(info->version, MODULEVERSION, sizeof(info->version));
-	strlcpy(info->bus_info, ndev->dev.parent->bus_id,
+	strlcpy(info->bus_info, dev_name(ndev->dev.parent),
 		sizeof(info->bus_info));
 }
 
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 9c875bb..79aec32 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -355,8 +355,8 @@ static int mii_probe (struct net_device *dev)
 	/* now we are supposed to have a proper phydev, to attach to... */
 	BUG_ON(phydev->attached_dev);
 
-	phydev = phy_connect(dev, phydev->dev.bus_id, ...
[ message continues ]
[view original message]
From: Stephen Hemminger
Subject: Re: [PATCH 15/61] net: struct device - replace bus_id with dev_name(), dev_set_name()
Date: Tuesday, March 24, 2009 - 8:31 pm

On Tue, 24 Mar 2009 17:26:19 -0700

I know this is needed, but could please put some more explicit rational
in changelog.
--


[ message continues ]
[view original message]
From: Greg KH
Subject: Re: [PATCH 15/61] net: struct device - replace bus_id with dev_name(), dev_set_name()
Date: Tuesday, March 24, 2009 - 9:18 pm

bus_id is going away, much more rational isn't really needed :)

thanks,

greg k-h
--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 15/61] net: struct device - replace bus_id with dev_name(), dev_set_name()
Date: Tuesday, March 24, 2009 - 11:29 pm

From: Greg Kroah-Hartman <gregkh@suse.de>

None of this patch applies to net-next-2.6

Probably because, just like the wimax case, these changes
are already there.
--


[ message continues ]
[view original message]
From: Kay Sievers
Subject: Re: [PATCH 15/61] net: struct device - replace bus_id with dev_name(), dev_set_name()
Date: Wednesday, March 25, 2009 - 2:34 am

Yeah, I think -next handles duplicate and completely indentical
patches from differnt trees just fine, so that all has been in -next
for a while, and while it was still in Greg's tree when the other tree
merged it.

This patch is in your -next tree:
  http://git.kernel.org/?p=linux/kernel/git/davem/net-next-2.6.git;a=commit;h=db1d7bf70f...

The problem with -next is that if some tree is dropped because of a
non-trivial conflict, and Greg removes merged patches, later patches
in Greg's tree may fail because of missing changes. Maybe we need some
kind of annotation with the -next logic to handle such cases better?

Thanks,
Kay
--


[ message continues ]
Previous thread: Re: netfilter spurious ELOOP by David Miller on Tuesday, March 24, 2009 - 4:28 pm. (5 messages)

Next thread: [net-next PATCH] e1000e: add support for 82574 device ID 0x10F6 by Jeff Kirsher on Tuesday, March 24, 2009 - 6:32 pm. (2 messages)