| Message ID | 1298901925-16525-1-git-send-email-jamie@jamieiles.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Jamie Iles <jamie@jamieiles.com> Date: Mon, 28 Feb 2011 14:05:25 +0000 > Commit 71d6429 (Driver core: convert platform_{get,set}_drvdata to > static inline functions) now triggers a warning in the macb network > driver: > > CC drivers/net/macb.o > drivers/net/macb.c: In function ‘macb_mii_init’: > drivers/net/macb.c:263: warning: passing argument 1 of ‘platform_set_drvdata’ from incompatible pointer type > include/linux/platform_device.h:138: note: expected ‘struct platform_device *’ but argument is of type ‘struct net_device *’ > > Use dev_set_drvdata() on the device embedded in the net_device instead. > > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jamie Iles <jamie@jamieiles.com> Applied.
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index f69e73e..79ccb54 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -260,7 +260,7 @@ static int macb_mii_init(struct macb *bp) for (i = 0; i < PHY_MAX_ADDR; i++) bp->mii_bus->irq[i] = PHY_POLL; - platform_set_drvdata(bp->dev, bp->mii_bus); + dev_set_drvdata(&bp->dev->dev, bp->mii_bus); if (mdiobus_register(bp->mii_bus)) goto err_out_free_mdio_irq;
Commit 71d6429 (Driver core: convert platform_{get,set}_drvdata to static inline functions) now triggers a warning in the macb network driver: CC drivers/net/macb.o drivers/net/macb.c: In function ‘macb_mii_init’: drivers/net/macb.c:263: warning: passing argument 1 of ‘platform_set_drvdata’ from incompatible pointer type include/linux/platform_device.h:138: note: expected ‘struct platform_device *’ but argument is of type ‘struct net_device *’ Use dev_set_drvdata() on the device embedded in the net_device instead. Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Jamie Iles <jamie@jamieiles.com> --- drivers/net/macb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)