From 439f6e62a0dd8d7662fb732dbc3975c5387aa14d Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 28 Jul 2011 15:37:37 +0200 Subject: smc911x: embed eth_device into priv Signed-off-by: Sascha Hauer --- drivers/net/smc911x.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'drivers/net/smc911x.c') 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; -- cgit v1.2.3