nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

phylib: rename mii_bus::dev to mii_bus::parent

Browse source 
In preparation of giving mii_bus objects a device tree presence of
their own, rename struct mii_bus's ->dev argument to ->parent, since
having a 'struct device *dev' that points to our parent device
conflicts with introducing a 'struct device dev' representing our own
device.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Lennert Buytenhek 2008-10-01 15:41:33 +00:00 committed by David S. Miller
parent 236bb5e649
commit 18ee49ddb0
17 changed files with 17 additions and 17 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/platforms/82xx/ep8248e.c
View file

@ -137,7 +137,7 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
bus->irq[i] = -1; bus->irq[i] = -1;
bus->name = "ep8248e-mdio-bitbang"; bus->name = "ep8248e-mdio-bitbang";
bus->dev = &ofdev->dev; bus->parent = &ofdev->dev;
snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start); snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
return mdiobus_register(bus); return mdiobus_register(bus);

2
arch/powerpc/platforms/pasemi/gpio_mdio.c
View file

@ -272,7 +272,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
prop = of_get_property(np, "mdio-pin", NULL); prop = of_get_property(np, "mdio-pin", NULL);
priv->mdio_pin = *prop; priv->mdio_pin = *prop;
new_bus->dev = dev; new_bus->parent = dev;
dev_set_drvdata(dev, new_bus); dev_set_drvdata(dev, new_bus);
err = mdiobus_register(new_bus); err = mdiobus_register(new_bus);

2
drivers/net/fec_mpc52xx_phy.c
View file

@ -127,7 +127,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i
snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start); snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
bus->priv = priv; bus->priv = priv;
bus->dev = dev; bus->parent = dev;
dev_set_drvdata(dev, bus); dev_set_drvdata(dev, bus);
/* set MII speed */ /* set MII speed */

2
drivers/net/fs_enet/mii-bitbang.c
View file

@ -203,7 +203,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
if (!strcmp(np->type, "ethernet-phy")) if (!strcmp(np->type, "ethernet-phy"))
add_phy(new_bus, np); add_phy(new_bus, np);
new_bus->dev = &ofdev->dev; new_bus->parent = &ofdev->dev;
dev_set_drvdata(&ofdev->dev, new_bus); dev_set_drvdata(&ofdev->dev, new_bus);
ret = mdiobus_register(new_bus); ret = mdiobus_register(new_bus);

2
drivers/net/fs_enet/mii-fec.c
View file

@ -172,7 +172,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
if (!strcmp(np->type, "ethernet-phy")) if (!strcmp(np->type, "ethernet-phy"))
add_phy(new_bus, np); add_phy(new_bus, np);
new_bus->dev = &ofdev->dev; new_bus->parent = &ofdev->dev;
dev_set_drvdata(&ofdev->dev, new_bus); dev_set_drvdata(&ofdev->dev, new_bus);
ret = mdiobus_register(new_bus); ret = mdiobus_register(new_bus);

2
drivers/net/gianfar_mii.c
View file

@ -196,7 +196,7 @@ static int gfar_mdio_probe(struct device *dev)
new_bus->irq = pdata->irq; new_bus->irq = pdata->irq;
new_bus->dev = dev; new_bus->parent = dev;
dev_set_drvdata(dev, new_bus); dev_set_drvdata(dev, new_bus);
/* /*

2
drivers/net/macb.c
View file

@ -250,7 +250,7 @@ static int macb_mii_init(struct macb *bp)
bp->mii_bus.reset = &macb_mdio_reset; bp->mii_bus.reset = &macb_mdio_reset;
snprintf(bp->mii_bus.id, MII_BUS_ID_SIZE, "%x", bp->pdev->id); snprintf(bp->mii_bus.id, MII_BUS_ID_SIZE, "%x", bp->pdev->id);
bp->mii_bus.priv = bp; bp->mii_bus.priv = bp;
bp->mii_bus.dev = &bp->dev->dev; bp->mii_bus.parent = &bp->dev->dev;
pdata = bp->pdev->dev.platform_data; pdata = bp->pdev->dev.platform_data;
if (pdata) if (pdata)

2
drivers/net/mv643xx_eth.c
View file

@ -2368,7 +2368,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
msp->smi_bus.read = smi_bus_read; msp->smi_bus.read = smi_bus_read;
msp->smi_bus.write = smi_bus_write, msp->smi_bus.write = smi_bus_write,
snprintf(msp->smi_bus.id, MII_BUS_ID_SIZE, "%d", pdev->id); snprintf(msp->smi_bus.id, MII_BUS_ID_SIZE, "%d", pdev->id);
msp->smi_bus.dev = &pdev->dev; msp->smi_bus.parent = &pdev->dev;
msp->smi_bus.phy_mask = 0xffffffff; msp->smi_bus.phy_mask = 0xffffffff;
if (mdiobus_register(&msp->smi_bus) < 0) if (mdiobus_register(&msp->smi_bus) < 0)
goto out_unmap; goto out_unmap;

2
drivers/net/phy/fixed.c
View file

@ -215,7 +215,7 @@ static int __init fixed_mdio_bus_init(void)
snprintf(fmb->mii_bus.id, MII_BUS_ID_SIZE, "0"); snprintf(fmb->mii_bus.id, MII_BUS_ID_SIZE, "0");
fmb->mii_bus.name = "Fixed MDIO Bus"; fmb->mii_bus.name = "Fixed MDIO Bus";
fmb->mii_bus.dev = &pdev->dev; fmb->mii_bus.parent = &pdev->dev;
fmb->mii_bus.read = &fixed_mdio_read; fmb->mii_bus.read = &fixed_mdio_read;
fmb->mii_bus.write = &fixed_mdio_write; fmb->mii_bus.write = &fixed_mdio_write;
fmb->mii_bus.irq = fmb->irqs; fmb->mii_bus.irq = fmb->irqs;

2
drivers/net/phy/mdio-ofgpio.c
View file

@ -142,7 +142,7 @@ static int __devinit mdio_ofgpio_probe(struct of_device *ofdev,
if (!strcmp(np->type, "ethernet-phy")) if (!strcmp(np->type, "ethernet-phy"))
add_phy(new_bus, np); add_phy(new_bus, np);
new_bus->dev = &ofdev->dev; new_bus->parent = &ofdev->dev;
dev_set_drvdata(&ofdev->dev, new_bus); dev_set_drvdata(&ofdev->dev, new_bus);
ret = mdiobus_register(new_bus); ret = mdiobus_register(new_bus);

2
drivers/net/phy/mdio_bus.c
View file

@ -107,7 +107,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
phydev->irq = bus->irq != NULL ? bus->irq[addr] : PHY_POLL; phydev->irq = bus->irq != NULL ? bus->irq[addr] : PHY_POLL;
phydev->dev.parent = bus->dev; phydev->dev.parent = bus->parent;
phydev->dev.bus = &mdio_bus_type; phydev->dev.bus = &mdio_bus_type;
snprintf(phydev->dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus->id, addr); snprintf(phydev->dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus->id, addr);

2
drivers/net/sb1250-mac.c
View file

@ -2378,7 +2378,7 @@ static int sbmac_init(struct platform_device *pldev, long long base)
for (i = 0; i < PHY_MAX_ADDR; ++i) for (i = 0; i < PHY_MAX_ADDR; ++i)
sc->mii_bus.irq[i] = SBMAC_PHY_INT; sc->mii_bus.irq[i] = SBMAC_PHY_INT;
sc->mii_bus.dev = &pldev->dev; sc->mii_bus.parent = &pldev->dev;
dev_set_drvdata(&pldev->dev, &sc->mii_bus); dev_set_drvdata(&pldev->dev, &sc->mii_bus);
return 0; return 0;

2
drivers/net/sh_eth.c
View file

@ -1140,7 +1140,7 @@ static int sh_mdio_init(struct net_device *ndev, int id)
/* Hook up MII support for ethtool */ /* Hook up MII support for ethtool */
mdp->mii_bus->name = "sh_mii"; mdp->mii_bus->name = "sh_mii";
mdp->mii_bus->dev = &ndev->dev; mdp->mii_bus->parent = &ndev->dev;
mdp->mii_bus->id[0] = id; mdp->mii_bus->id[0] = id;
/* PHY IRQ */ /* PHY IRQ */

2
drivers/net/tc35815.c
View file

@ -768,7 +768,7 @@ static int tc_mii_init(struct net_device *dev)
snprintf(lp->mii_bus.id, MII_BUS_ID_SIZE, "%x", snprintf(lp->mii_bus.id, MII_BUS_ID_SIZE, "%x",
(lp->pci_dev->bus->number << 8) | lp->pci_dev->devfn); (lp->pci_dev->bus->number << 8) | lp->pci_dev->devfn);
lp->mii_bus.priv = dev; lp->mii_bus.priv = dev;
lp->mii_bus.dev = &lp->pci_dev->dev; lp->mii_bus.parent = &lp->pci_dev->dev;
lp->mii_bus.irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL); lp->mii_bus.irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
if (!lp->mii_bus.irq) { if (!lp->mii_bus.irq) {
err = -ENOMEM; err = -ENOMEM;

2
drivers/net/tg3.c
View file

@ -961,7 +961,7 @@ static int tg3_mdio_init(struct tg3 *tp)
snprintf(mdio_bus->id, MII_BUS_ID_SIZE, "%x", snprintf(mdio_bus->id, MII_BUS_ID_SIZE, "%x",
(tp->pdev->bus->number << 8) | tp->pdev->devfn); (tp->pdev->bus->number << 8) | tp->pdev->devfn);
mdio_bus->priv = tp; mdio_bus->priv = tp;
mdio_bus->dev = &tp->pdev->dev; mdio_bus->parent = &tp->pdev->dev;
mdio_bus->read = &tg3_mdio_read; mdio_bus->read = &tg3_mdio_read;
mdio_bus->write = &tg3_mdio_write; mdio_bus->write = &tg3_mdio_write;
mdio_bus->reset = &tg3_mdio_reset; mdio_bus->reset = &tg3_mdio_reset;

2
drivers/net/ucc_geth_mii.c
View file

@ -187,7 +187,7 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma
new_bus->priv = (void __force *)regs; new_bus->priv = (void __force *)regs;
new_bus->dev = device; new_bus->parent = device;
dev_set_drvdata(device, new_bus); dev_set_drvdata(device, new_bus);
/* Read MII management master from device tree */ /* Read MII management master from device tree */

2
include/linux/phy.h
View file

@ -99,7 +99,7 @@ struct mii_bus {
*/ */
struct mutex mdio_lock; struct mutex mdio_lock;
struct device *dev; struct device *parent;
/* list of all PHYs on bus */ /* list of all PHYs on bus */
struct phy_device *phy_map[PHY_MAX_ADDR]; struct phy_device *phy_map[PHY_MAX_ADDR];