projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
net
/
phy
/
mdio_bus.c
diff --git
a/drivers/net/phy/mdio_bus.c
b/drivers/net/phy/mdio_bus.c
index
ad93b0d
..
1b236bd
100644
(file)
--- a/
drivers/net/phy/mdio_bus.c
+++ b/
drivers/net/phy/mdio_bus.c
@@
-29,7
+29,6
@@
#include <linux/spinlock.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/mm.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/mii.h>
#include <linux/ethtool.h>
#include <linux/phy.h>
#include <linux/mii.h>
#include <linux/ethtool.h>
#include <linux/phy.h>
@@
-61,6
+60,11
@@
int mdiobus_register(struct mii_bus *bus)
for (i = 0; i < PHY_MAX_ADDR; i++) {
struct phy_device *phydev;
for (i = 0; i < PHY_MAX_ADDR; i++) {
struct phy_device *phydev;
+ if (bus->phy_mask & (1 << i)) {
+ bus->phy_map[i] = NULL;
+ continue;
+ }
+
phydev = get_phy_device(bus, i);
if (IS_ERR(phydev))
phydev = get_phy_device(bus, i);
if (IS_ERR(phydev))
@@
-79,7
+83,7
@@
int mdiobus_register(struct mii_bus *bus)
phydev->dev.parent = bus->dev;
phydev->dev.bus = &mdio_bus_type;
phydev->dev.parent = bus->dev;
phydev->dev.bus = &mdio_bus_type;
- s
printf(phydev->dev.bus_id, "phy%d:%d"
, bus->id, i);
+ s
nprintf(phydev->dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT
, bus->id, i);
phydev->bus = bus;
phydev->bus = bus;