diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-28 10:36:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-28 12:07:39 +0200 |
| commit | 98d9ce9bec11ddca8d3cdc5c850bc8e9901c1c95 (patch) | |
| tree | 4e78a0e0087d363f5f56cdfda43ec92a237446f3 /drivers/net | |
| parent | 0b9bb06a36914d78dea7d798233d74194bcd1947 (diff) | |
| download | barebox-98d9ce9bec11ddca8d3cdc5c850bc8e9901c1c95.tar.gz barebox-98d9ce9bec11ddca8d3cdc5c850bc8e9901c1c95.tar.xz | |
net i.MX fec: embed ethernet device into priv
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fec_imx.c | 4 | ||||
| -rw-r--r-- | drivers/net/fec_imx.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 6886ccc6c9..72f7faa3b1 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -605,9 +605,9 @@ static int fec_probe(struct device_d *dev) #ifdef CONFIG_ARCH_IMX27 PCCR0 |= PCCR0_FEC_EN; #endif - edev = (struct eth_device *)xzalloc(sizeof(struct eth_device)); + fec = xzalloc(sizeof(*fec)); + edev = &fec->edev; dev->type_data = edev; - fec = (struct fec_priv *)xzalloc(sizeof(*fec)); edev->priv = fec; edev->open = fec_open; edev->init = fec_init; diff --git a/drivers/net/fec_imx.h b/drivers/net/fec_imx.h index e07071a883..19f4709a77 100644 --- a/drivers/net/fec_imx.h +++ b/drivers/net/fec_imx.h @@ -144,6 +144,7 @@ struct buffer_descriptor { * @brief i.MX27-FEC private structure */ struct fec_priv { + struct eth_device edev; void __iomem *regs; xceiver_type xcv_type; /* transceiver type */ struct buffer_descriptor __iomem *rbd_base; /* RBD ring */ |