From patchwork Fri Nov 2 17:17:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Hlavacek X-Patchwork-Id: 196629 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 461D52C0084 for ; Sat, 3 Nov 2012 04:19:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E8E884A1B7; Fri, 2 Nov 2012 18:19:35 +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 Zk4i09ZDDqqd; Fri, 2 Nov 2012 18:19:35 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 612C94A16B; Fri, 2 Nov 2012 18:19:07 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 66A6D4A166 for ; Fri, 2 Nov 2012 18:19:05 +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 q8TR+ZVrgAOY for ; Fri, 2 Nov 2012 18:19:04 +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 67DDC4A101 for ; Fri, 2 Nov 2012 18:18:56 +0100 (CET) Received: by mail-ee0-f44.google.com with SMTP id d4so2187551eek.3 for ; Fri, 02 Nov 2012 10:18:56 -0700 (PDT) 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=FbfgPC07sc7vttweRYpZCKVI0XOXN1pTafDnFcFFs6o=; b=0gt8yhle6yatc5IHLyoUJgfQ5aj1VjSJrC/LbJiJVQVPD5KJ/XauZJE+NynvXF5yfe 7uxhvhTJcei6dqe8/8VMeJxIUmjk4f5MfOBssyn1jhoB1LDyAfgR1I9YWOZXOzmIb9s9 bBdCz2idmZCQoNTPDe6G1pE0ZoeDxN9CTH1GBX0pngOTtZm3LWFYVqf2xZ3v8fwWO3pq Gxe6ODYLCJ7arzikpCv5eAtWDh9rXVuItFj75hHnY1EQYa5MLP12br6VE7FR/Fpy8Jw0 WUKb3w7TkWEgtgVFJMskKMjQCZPfC/6X0WFsYt9T45B4bqJ4KpnvFCpAqVnqVH7B2I15 dbDA== Received: by 10.14.172.195 with SMTP id t43mr8874936eel.17.1351876736597; Fri, 02 Nov 2012 10:18:56 -0700 (PDT) Received: from tapir ([2001:1488:ac14:1400:224:7eff:fe6e:2518]) by mx.google.com with ESMTPS id c6sm24516966eep.17.2012.11.02.10.18.55 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 10:18:55 -0700 (PDT) Received: by tapir (Postfix, from userid 2001) id 2873E46102F; Fri, 2 Nov 2012 18:18:54 +0100 (CET) From: Tomas Hlavacek To: u-boot@lists.denx.de Date: Fri, 2 Nov 2012 18:17:54 +0100 Message-Id: <1351876722-5183-3-git-send-email-tmshlvck@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351876722-5183-1-git-send-email-tmshlvck@gmail.com> References: <1351876722-5183-1-git-send-email-tmshlvck@gmail.com> Cc: marex@denx.de Subject: [U-Boot] [RFC PATCH 02/50] net: 4xx_enet: 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 --- drivers/net/4xx_enet.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c index 27b66dd..309e616 100644 --- a/drivers/net/4xx_enet.c +++ b/drivers/net/4xx_enet.c @@ -1905,6 +1905,13 @@ static int ppc_4xx_eth_rx (struct eth_device *dev) return length; } +static struct eth_ops ppc_4xx_eth_ops = { + .init = ppc_4xx_eth_init, + .send = ppc_4xx_eth_send, + .recv = ppc_4xx_eth_rx, + .halt = ppc_4xx_eth_halt +}; + int ppc_4xx_eth_initialize (bd_t * bis) { static int virgin = 0; @@ -2023,10 +2030,7 @@ int ppc_4xx_eth_initialize (bd_t * bis) sprintf (dev->name, "ppc_4xx_eth%d", eth_num - CONFIG_EMAC_NR_START); dev->priv = (void *) hw; - dev->eo->init = ppc_4xx_eth_init; - dev->eo->halt = ppc_4xx_eth_halt; - dev->eo->send = ppc_4xx_eth_send; - dev->eo->recv = ppc_4xx_eth_rx; + dev->eo = &ppc_4xx_eth_ops; eth_register(dev);