From patchwork Wed Apr 15 04:30:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25960 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 34034DE0E7 for ; Wed, 15 Apr 2009 14:30:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750972AbZDOEal (ORCPT ); Wed, 15 Apr 2009 00:30:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751141AbZDOEaj (ORCPT ); Wed, 15 Apr 2009 00:30:39 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:43042 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751080AbZDOEai (ORCPT ); Wed, 15 Apr 2009 00:30:38 -0400 Received: by mail-fx0-f158.google.com with SMTP id 2so2713444fxm.37 for ; Tue, 14 Apr 2009 21:30:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=qB0HjomM29mMAC0NG1cFLmkHHH8JBguWSVYixvbnhis=; b=Qd/AT+pot2deVnc0xvPpDFVniqE4vLgCF/jQ6mS2Aq3Rem8y8AOyOdtTxeh1Z1A3Dy tPWg9ShiyjdH8dNyQr4SXW+Bra+peJiTBDB1rG6m22SoIPOhD2hEvGYTQLKyuVMwIXXP 0pdXXWlfZTGmhRgDoxz0rMz/jsyHyFJ01yhpE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Q2MkODa+fHnH5IA8XioazwYXIlTsTc9gc5bg+PXZr56UwJb2dkG9wNGFDbsl7Wct5K Rtjyq9Mfpj6ObeaigsitbHGJHL7/TghIuXML6PWvuWU7vAzVaesGaAbVpSrn4jNf1Hzs ZwmN6lqSLyK02+rEJztNCYwGMQ4CPxVsAJ+J4= Received: by 10.204.123.136 with SMTP id p8mr1874312bkr.21.1239769837842; Tue, 14 Apr 2009 21:30:37 -0700 (PDT) Received: from localhost.localdomain ([91.78.157.235]) by mx.google.com with ESMTPS id 22sm7740798fkr.17.2009.04.14.21.30.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 14 Apr 2009 21:30:37 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 4/5] bfin_mac: convert to net_device_ops Date: Wed, 15 Apr 2009 08:30:24 +0400 Message-Id: <1239769825-12413-4-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239769825-12413-3-git-send-email-a.beregalov@gmail.com> References: <1239769825-12413-1-git-send-email-a.beregalov@gmail.com> <1239769825-12413-2-git-send-email-a.beregalov@gmail.com> <1239769825-12413-3-git-send-email-a.beregalov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/bfin_mac.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index 9afe809..9326aef 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c @@ -979,6 +979,20 @@ static int bfin_mac_open(struct net_device *dev) return 0; } +static const struct net_device_ops bfin_mac_netdev_ops = { + .ndo_open = bfin_mac_open, + .ndo_stop = bfin_mac_close, + .ndo_start_xmit = bfin_mac_hard_start_xmit, + .ndo_set_mac_address = bfin_mac_set_mac_address, + .ndo_tx_timeout = bfin_mac_timeout, + .ndo_set_multicast_list = bfin_mac_set_multicast_list, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = bfin_mac_poll, +#endif +}; + /* * * this makes the board clean up everything that it can @@ -1086,15 +1100,7 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev) /* Fill in the fields of the device structure with ethernet values. */ ether_setup(ndev); - ndev->open = bfin_mac_open; - ndev->stop = bfin_mac_close; - ndev->hard_start_xmit = bfin_mac_hard_start_xmit; - ndev->set_mac_address = bfin_mac_set_mac_address; - ndev->tx_timeout = bfin_mac_timeout; - ndev->set_multicast_list = bfin_mac_set_multicast_list; -#ifdef CONFIG_NET_POLL_CONTROLLER - ndev->poll_controller = bfin_mac_poll; -#endif + ndev->netdev_ops = &bfin_mac_netdev_ops; ndev->ethtool_ops = &bfin_mac_ethtool_ops; spin_lock_init(&lp->lock);