From patchwork Wed Nov 21 13:23:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Hlavacek X-Patchwork-Id: 200747 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 7C3562C009A for ; Thu, 22 Nov 2012 00:35:06 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9586D4A2CE; Wed, 21 Nov 2012 14:34:37 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jPmGJxbQv+X7; Wed, 21 Nov 2012 14:34:36 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2A1AE4A151; Wed, 21 Nov 2012 14:34:24 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C1B104A0F0 for ; Wed, 21 Nov 2012 14:32:37 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id icIQZkHathSx for ; Wed, 21 Nov 2012 14:32:37 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ee0-f44.google.com (mail-ee0-f44.google.com [74.125.83.44]) by theia.denx.de (Postfix) with ESMTPS id 952B44A34D for ; Wed, 21 Nov 2012 14:32:14 +0100 (CET) Received: by mail-ee0-f44.google.com with SMTP id b47so4438289eek.3 for ; Wed, 21 Nov 2012 05:32:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=0ukrQk28+CAhOeDRQI/XkI3oJ9vBvFaCxpGPr+8n/hU=; b=0YJWC6oCv2LBVWYZOLcm6oGn7nGLAPWz9FmGonzQJxseokZclCIgJ68h5uHURQp0HA 7HG3bLEiQHiKWa9RX6gNwhie232D3jjUSScFKSEqVlL94rXMa1PS/N91LNnXczfVvCaH Ay3hi3vs9dpPqNVeMD0joQmbkPr0WoN5zz66eZbPF1Y3cQZQgh9z+jLhz1haP1KZm5N8 /sq3ZTGA84K5UnzS7QoGRShRgXCRAhA2ILaFaEMltYlS3/Js/FlXlV8ZyKyUZ5gO6XWt eueY77NjRXwbmKjAQOPLkl/5hyLlUeEfP2uVif2cFTG6YIO/8eLpAJJ9YdRK8JKQVzPz w8Qw== Received: by 10.14.205.198 with SMTP id j46mr45790268eeo.27.1353504733761; Wed, 21 Nov 2012 05:32:13 -0800 (PST) Received: from tapir ([89.177.24.237]) by mx.google.com with ESMTPS id o49sm247056eep.5.2012.11.21.05.32.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 05:32:12 -0800 (PST) Received: by tapir (Postfix, from userid 2001) id E0D3F4637F3; Wed, 21 Nov 2012 14:24:21 +0100 (CET) From: Tomas Hlavacek To: u-boot@lists.denx.de Date: Wed, 21 Nov 2012 14:23:50 +0100 Message-Id: <1353504238-11277-60-git-send-email-tmshlvck@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353504238-11277-1-git-send-email-tmshlvck@gmail.com> References: <1351876722-5183-1-git-send-email-tmshlvck@gmail.com> <1353504238-11277-1-git-send-email-tmshlvck@gmail.com> Cc: marex@denx.de Subject: [U-Boot] [PATCH v2 59/67] net: cpci750/mv_eth: Pull out init of struct eth_ops X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.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/esd/cpci750/mv_eth.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/board/esd/cpci750/mv_eth.c b/board/esd/cpci750/mv_eth.c index 8be3f9b..f825780 100644 --- a/board/esd/cpci750/mv_eth.c +++ b/board/esd/cpci750/mv_eth.c @@ -202,6 +202,13 @@ void db64360_eth_disable (struct eth_device *dev) } +static struct eth_ops mv6436x_eth_ops = { + .init = (void *) db64360_eth_probe, + .halt = (void *) ethernet_phy_reset, + .send = (void *) db64360_eth_transmit, + .recv = (void *) db64360_eth_poll +}; + void mv6436x_eth_initialize (bd_t * bis) { struct eth_device *dev; @@ -259,10 +266,7 @@ void mv6436x_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 *) db64360_eth_probe; - dev->eo->halt = (void *) ethernet_phy_reset; - dev->eo->send = (void *) db64360_eth_transmit; - dev->eo->recv = (void *) db64360_eth_poll; + dev->eo = &mv6436x_eth_ops; ethernet_private = calloc (sizeof (*ethernet_private), 1);