From patchwork Wed Nov 21 13:23:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Hlavacek X-Patchwork-Id: 200758 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 5146C2C0098 for ; Thu, 22 Nov 2012 00:36:49 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6359F4A151; Wed, 21 Nov 2012 14:36:20 +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 VYJEUwC4yeKt; Wed, 21 Nov 2012 14:36:20 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E810C4A325; Wed, 21 Nov 2012 14:34:37 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6C8BB4A0F9 for ; Wed, 21 Nov 2012 14:32:44 +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 lnMTgOvYa9QJ for ; Wed, 21 Nov 2012 14:32:39 +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-ea0-f172.google.com (mail-ea0-f172.google.com [209.85.215.172]) by theia.denx.de (Postfix) with ESMTPS id 2B4134A353 for ; Wed, 21 Nov 2012 14:32:16 +0100 (CET) Received: by mail-ea0-f172.google.com with SMTP id a1so2244488eaa.3 for ; Wed, 21 Nov 2012 05:32:16 -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=J5NCP/26CHyxCspBkhNwLe57cUYlsmlaUyXQkJKevO8=; b=xBGfD/3mH+hyCNbpCUsi7PkVcEJeHsMMICUfB9ly2/2waDC38y2jjpabxm0ZU9JZSx zgWk52odkEK6ofn6f2L4xCVPpUmN8bFyJZbF+DOuuD6xVp6ddYukSsqQJRtajv2Qp05G gLr7E9KKLIlQufVOSh5gnol6YZShVMH3C0Jvxk9t8Uup5KyuRl01uMIuG+4pB8yFjIHJ 54sYLfZiiwyaIGaj2f9PydiR3t8ZlUWi4fHYcm63ZskwIR07bp7WTKMP7AraYNg/EFgJ Lw3qsh9D2lR8CFu3G6csei73FxCVtEs6jvedxEK2zh2O9Nlga7TSm1GooNs3g91w9X6I iCfg== Received: by 10.14.221.9 with SMTP id q9mr45932872eep.3.1353504736036; Wed, 21 Nov 2012 05:32:16 -0800 (PST) Received: from tapir ([89.177.24.237]) by mx.google.com with ESMTPS id e2sm231210eeo.8.2012.11.21.05.32.14 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 05:32:14 -0800 (PST) Received: by tapir (Postfix, from userid 2001) id EF60F46376E; Wed, 21 Nov 2012 14:24:20 +0100 (CET) From: Tomas Hlavacek To: u-boot@lists.denx.de Date: Wed, 21 Nov 2012 14:23:18 +0100 Message-Id: <1353504238-11277-28-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 27/67] net: macb: 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/macb.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 2c53902..c0f1202 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -529,6 +529,14 @@ static int macb_write_hwaddr(struct eth_device *dev) return 0; } +static struct eth_ops macb_ops = { + .init = macb_init, + .halt = macb_halt, + .send = macb_send, + .recv = macb_recv, + .write_hwaddr = macb_write_hwaddr +}; + int macb_eth_initialize(int id, void *regs, unsigned int phy_addr) { struct macb_device *macb; @@ -558,11 +566,7 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr) macb->phy_addr = phy_addr; sprintf(netdev->name, "macb%d", id); - netdev->eo->init = macb_init; - netdev->eo->halt = macb_halt; - netdev->eo->send = macb_send; - netdev->eo->recv = macb_recv; - netdev->eo->write_hwaddr = macb_write_hwaddr; + netdev->eo = &macb_ops; /* * Do some basic initialization so that we at least can talk