summaryrefslogtreecommitdiffstats
path: root/drivers/net/smc911x.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-07-28 15:37:37 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-07-28 15:37:37 +0200
commit439f6e62a0dd8d7662fb732dbc3975c5387aa14d (patch)
tree27a6e37d68ae7718c8842e495aecd1a78aa5e92b /drivers/net/smc911x.c
parentc0195269e1c0933838bd81d92532972b2b60e4ce (diff)
downloadbarebox-439f6e62a0dd8d7662fb732dbc3975c5387aa14d.tar.gz
barebox-439f6e62a0dd8d7662fb732dbc3975c5387aa14d.tar.xz
smc911x: embed eth_device into priv
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/smc911x.c')
-rw-r--r--drivers/net/smc911x.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 615fd617b0..8c6f9fc19e 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -368,6 +368,7 @@
#define CHIP_9221 0x9221
struct smc911x_priv {
+ struct eth_device edev;
struct mii_device miidev;
void __iomem *base;
};
@@ -712,12 +713,10 @@ static int smc911x_probe(struct device_d *dev)
dev_info(dev, "detected %s controller\n", chip_ids[i].name);
- edev = xzalloc(sizeof(struct eth_device) +
- sizeof(struct smc911x_priv));
+ priv = xzalloc(sizeof(*priv));
+ edev = &priv->edev;
dev->type_data = edev;
- edev->priv = (struct smc911x_priv *)(edev + 1);
-
- priv = edev->priv;
+ edev->priv = priv;
edev->init = smc911x_init_dev;
edev->open = smc911x_eth_open;