From patchwork Wed Nov 21 13:23:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Hlavacek X-Patchwork-Id: 200745 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 AF1A92C009A for ; Thu, 22 Nov 2012 00:34:42 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BEA594A1D3; Wed, 21 Nov 2012 14:32:29 +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 CmeX1V+HOC+z; Wed, 21 Nov 2012 14:32:29 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6AA414A1D4; Wed, 21 Nov 2012 14:27:57 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DBFC34A03A for ; Wed, 21 Nov 2012 14:25:34 +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 t+itYTDku-6g for ; Wed, 21 Nov 2012 14:25:30 +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 CFBB04A0BA for ; Wed, 21 Nov 2012 14:24:37 +0100 (CET) Received: by mail-ee0-f44.google.com with SMTP id b47so4433803eek.3 for ; Wed, 21 Nov 2012 05:24:37 -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=F28ib5I0mn/xQMFq8mM0wvBgLvVy2AoVI++dq6sYpE4=; b=OOhOiTaM/ymgdI9dsGwkR7Pweuewz6AuDTpGW/I2YP/LAgR9m5oUBwtayjrfQQxl94 aij/I67a4WGLVOtBDnvopAxLVSs3D64zAG7u8WUHlsGCY5skHUk+Wjal1eNeb+9Pp/BM QqG9c8CbseFeEEA4efF3gCYbmEcUEU8V3FqS8SWeKFnSxIQkCLt9EcTZCHohnZ29I0N+ q44FKpNBvAYDivNtYm0xg3Qjad7QOKD7twzGebxCDzSNXS/BSZH9QUFEVTPpG1Qsh68I nbIpi3BxmRKCaUwXXk+9dhCKnwnuBTrT6rzWoLS9dZKugxh5ovIdzV4Aeh2zVPifq8a5 SiEQ== Received: by 10.14.203.132 with SMTP id f4mr45614661eeo.11.1353504277395; Wed, 21 Nov 2012 05:24:37 -0800 (PST) Received: from tapir ([2001:1ab0:b101::1003]) by mx.google.com with ESMTPS id e7sm229720eep.1.2012.11.21.05.24.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 05:24:37 -0800 (PST) Received: by tapir (Postfix, from userid 2001) id 26693463805; Wed, 21 Nov 2012 14:24:22 +0100 (CET) From: Tomas Hlavacek To: u-boot@lists.denx.de Date: Wed, 21 Nov 2012 14:23:58 +0100 Message-Id: <1353504238-11277-68-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 67/67] net: usb: smsc95xx: 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/usb/eth/smsc95xx.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index b8c2f2e..9f278c5 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -881,6 +881,14 @@ int smsc95xx_eth_probe(struct usb_device *dev, unsigned int ifnum, return 1; } +static struct eth_ops smsc95xx_ops = { + .init = smsc95xx_init, + .halt = smsc95xx_halt, + .send = smsc95xx_send, + .recv = smsc95xx_recv, + .write_hwaddr = smsc95xx_write_hwaddr +}; + int smsc95xx_eth_get_info(struct usb_device *dev, struct ueth_data *ss, struct eth_device *eth) { @@ -890,11 +898,7 @@ int smsc95xx_eth_get_info(struct usb_device *dev, struct ueth_data *ss, return 0; } sprintf(eth->name, "%s%d", SMSC95XX_BASE_NAME, curr_eth_dev++); - eth->eo->init = smsc95xx_init; - eth->eo->send = smsc95xx_send; - eth->eo->recv = smsc95xx_recv; - eth->eo->halt = smsc95xx_halt; - eth->eo->write_hwaddr = smsc95xx_write_hwaddr; + eth->eo = &smsc95xx_ops; eth->priv = ss; return 1; }