From patchwork Wed Nov 21 13:23:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Hlavacek X-Patchwork-Id: 200729 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 14B112C0097 for ; Thu, 22 Nov 2012 00:32:05 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B557F4A177; Wed, 21 Nov 2012 14:30:43 +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 QIAN8PYbzQsj; Wed, 21 Nov 2012 14:30:43 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B43834A178; Wed, 21 Nov 2012 14:27:41 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9742A4A053 for ; Wed, 21 Nov 2012 14:25:14 +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 qsz8q0MRfcY4 for ; Wed, 21 Nov 2012 14:25:13 +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 BD5534A0AE for ; Wed, 21 Nov 2012 14:24:33 +0100 (CET) Received: by mail-ea0-f172.google.com with SMTP id a1so2241702eaa.3 for ; Wed, 21 Nov 2012 05:24:33 -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=66v00eVGt871kLxTGIhtZ3QtYR5MPXUWcBwUl9xBvro=; b=VcCApxYb+ph3hdWyyM79SwyCwFTDRuJwhsTGCmujmu/Vsn5AfbLzGcJzuQ9f0CsSjn xjpt8JaMKYrog+0O666xE3MG/YCSE5QWvuQ6GxVUcA2/eKJmwFa7pW4vLwkeHa6CGJA2 bwpRKg8cg/jhUitQC+7pWlPCIF4F4kGZS4XAxtk4w+AC5nXDszMnMk2DS1GvnR/L10Js 78NaXGvziA0UrX5CF5KdLbN2M7V/ZuNhVyn9+0hECgNJybwYzOFkMS2UNjlANw/TX6I+ a+oOp05hSlKCxGVVuKk84U99NXbQIUlNAH0IZ/Hs0Yybw34wfKlCYLbJTN5cHaAXHpge K6OQ== Received: by 10.14.184.134 with SMTP id s6mr37082365eem.43.1353504273674; Wed, 21 Nov 2012 05:24:33 -0800 (PST) Received: from tapir ([2001:1ab0:b101::1003]) by mx.google.com with ESMTPS id v47sm188336eeo.9.2012.11.21.05.24.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 05:24:33 -0800 (PST) Received: by tapir (Postfix, from userid 2001) id BD7984637E4; 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:45 +0100 Message-Id: <1353504238-11277-55-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 54/67] net: mpc85xx_fec: 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 --- arch/powerpc/cpu/mpc85xx/ether_fcc.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c index 3b9eafa..f3c188d 100644 --- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c +++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c @@ -435,6 +435,13 @@ static void fec_halt(struct eth_device* dev) } } +static struct eth_ops fec_ops = { + .init = fec_init, + .halt = fec_halt, + .send = fec_send, + .recv = fec_recv +}; + int fec_initialize(bd_t *bis) { struct eth_device* dev; @@ -448,10 +455,7 @@ int fec_initialize(bd_t *bis) sprintf(dev->name, "FCC%d", ether_fcc_info[i].ether_index + 1); dev->priv = ðer_fcc_info[i]; - dev->eo->init = fec_init; - dev->eo->halt = fec_halt; - dev->eo->send = fec_send; - dev->eo->recv = fec_recv; + dev->eo = &fec_ops; eth_register(dev);