From patchwork Wed Nov 21 13:23:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Hlavacek X-Patchwork-Id: 200695 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 C22E22C0085 for ; Thu, 22 Nov 2012 00:26:29 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 191774A0B3; Wed, 21 Nov 2012 14:26:11 +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 Ygyz4V9yRGdv; Wed, 21 Nov 2012 14:26:10 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B3CB84A0C7; Wed, 21 Nov 2012 14:24:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B33274A041 for ; Wed, 21 Nov 2012 14:24:45 +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 clkcA8eK0Z+y for ; Wed, 21 Nov 2012 14:24:44 +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 4D6ED4A047 for ; Wed, 21 Nov 2012 14:24:26 +0100 (CET) Received: by mail-ee0-f44.google.com with SMTP id b47so4433819eek.3 for ; Wed, 21 Nov 2012 05:24:26 -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=qGl/5PxEUdEMfZvWQ3Un9+ynKeJcUh5B9ApC2Qmj0Ww=; b=zNdPdGvLj0dUd5fWMN/+sne7ruMeCFTZN9v2QRijjDaiWKUEko7FaSX7gVy7l/IWkw 05qFTks4jQqOWekJpDJi13iYP5VDfhcVxH4xeYndI4IrKJJ20BwDEYNtJlwkCDyzuKPE HFy/VSbV8fSeWBCBGDgEoSkranI3+qSu3l1SJGi3Iai5/lXAYHHEsKsRp2uqIDjrZSvz yq5jlsUx+RUBZBgo1slB286szj8plDMfkCk5nxj7WZG2CwPOghwSS4qSkcvwEG9fTO6+ HSjy89zsaaHEo/KnV9mgETfPas6IaREsMesLJaCOiq1hYyl5GkVekwdGNrPNucKTXHnc jvHQ== Received: by 10.14.223.199 with SMTP id v47mr45703309eep.45.1353504266202; Wed, 21 Nov 2012 05:24:26 -0800 (PST) Received: from tapir ([2001:1ab0:b101::1003]) by mx.google.com with ESMTPS id o47sm179199eem.11.2012.11.21.05.24.24 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 05:24:24 -0800 (PST) Received: by tapir (Postfix, from userid 2001) id 6FDB2463621; 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:00 +0100 Message-Id: <1353504238-11277-10-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 09/67] net: calxedaxgmac: 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/calxedaxgmac.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c index 2346feb..3550160 100644 --- a/drivers/net/calxedaxgmac.c +++ b/drivers/net/calxedaxgmac.c @@ -508,6 +508,15 @@ static void xgmac_halt(struct eth_device *dev) priv->rx_currdesc = 0; } +static struct eth_ops xgmac_ops = { + .init = xgmac_init, + .send = xgmac_tx, + .recv = xgmac_rx, + .halt = xgmac_halt +}; + + + int calxedaxgmac_initialize(u32 id, ulong base_addr) { struct eth_device *dev; @@ -543,10 +552,7 @@ int calxedaxgmac_initialize(u32 id, ulong base_addr) macaddr[0] = readl(®s->macaddr[0].lo); memcpy(dev->enetaddr, macaddr, 6); - dev->eo->init = xgmac_init; - dev->eo->send = xgmac_tx; - dev->eo->recv = xgmac_rx; - dev->eo->halt = xgmac_halt; + dev->eo = &xgmac_ops; eth_register(dev);