From patchwork Wed Nov 21 13:23:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [U-Boot, v2, 58/67] net: db64460/mv_eth: Pull out init of struct eth_ops Date: Wed, 21 Nov 2012 03:23:49 -0000 From: Tomas Hlavacek X-Patchwork-Id: 200746 Message-Id: <1353504238-11277-59-git-send-email-tmshlvck@gmail.com> To: u-boot@lists.denx.de Cc: marex@denx.de Add static struct eth_ops and set ops function pointers statically. Remove setting eth_ops members dynamically. This is a step toward converting the driver for DM. Signed-off-by: Tomas Hlavacek --- board/Marvell/db64460/mv_eth.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/board/Marvell/db64460/mv_eth.c b/board/Marvell/db64460/mv_eth.c index df09be1..22bdafc 100644 --- a/board/Marvell/db64460/mv_eth.c +++ b/board/Marvell/db64460/mv_eth.c @@ -202,6 +202,13 @@ void db64460_eth_disable (struct eth_device *dev) } +static struct eth_ops mv6446x_eth_ops = { + .init = (void *) db64460_eth_probe, + .halt = (void *) ethernet_phy_reset, + .send = (void *) db64460_eth_transmit, + .recv = (void *) db64460_eth_poll +}; + void mv6446x_eth_initialize (bd_t * bis) { struct eth_device *dev; @@ -259,10 +266,7 @@ void mv6446x_eth_initialize (bd_t * bis) /* ronen - set the MAC addr in the HW */ eth_port_uc_addr_set (devnum, dev->enetaddr, 0); - dev->eo->init = (void *) db64460_eth_probe; - dev->eo->halt = (void *) ethernet_phy_reset; - dev->eo->send = (void *) db64460_eth_transmit; - dev->eo->recv = (void *) db64460_eth_poll; + dev->eo = &mv6446x_eth_ops; ethernet_private = calloc (sizeof (*ethernet_private), 1); dev->priv = (void *)ethernet_private;