From patchwork Wed Apr 15 22:52:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26031 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 2DCADDE1F0 for ; Thu, 16 Apr 2009 08:54:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756766AbZDOWxo (ORCPT ); Wed, 15 Apr 2009 18:53:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756755AbZDOWxm (ORCPT ); Wed, 15 Apr 2009 18:53:42 -0400 Received: from mail-bw0-f169.google.com ([209.85.218.169]:50591 "EHLO mail-bw0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756407AbZDOWx0 (ORCPT ); Wed, 15 Apr 2009 18:53:26 -0400 Received: by mail-bw0-f169.google.com with SMTP id 17so114640bwz.37 for ; Wed, 15 Apr 2009 15:53:25 -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=wtIKGXD8wj3IBFOkyN39e44XVUIhKwU5kZm/MuVw7oA=; b=QKS8dWorkb5ZWsQgDcIKlJVL7tI9wpDbpgsk4y8cGkuduDKpLxDzfkcKsYXUaMsRvg 22BxxeEyg+tX8Y97GVgTRRHaO5GnRvQtRZUn1D6SXohxhy0q9TAVbsu5KLmdfkwFm3q7 6E0jg+FCiCkCPKyZ6vPEPipOzKR9R1W5X/bBs= 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=CuOVvIQA0fqSOtx0pTcqPNKU9sNeVcGMRIaHu5tehMXJWbl/mrkbcxsFfzcs8xFvK3 Mwp6uPEXJzt3sFt+uBtQTnFLow+OSHb9MyGMpNMxT0bzSfY71BK4l7h+ZDXzhDBOKfiP vDK9fsZaC9duORODxCqmj5YQTbKhAf3oJvviM= Received: by 10.103.192.2 with SMTP id u2mr432464mup.2.1239836005456; Wed, 15 Apr 2009 15:53:25 -0700 (PDT) Received: from localhost.localdomain (ppp91-76-133-38.pppoe.mtu-net.ru [91.76.133.38]) by mx.google.com with ESMTPS id n7sm720179mue.36.2009.04.15.15.53.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:24 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 18/26] mvme147: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:52 +0400 Message-Id: <1239835980-22502-18-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-17-git-send-email-a.beregalov@gmail.com> References: <1239835980-22502-1-git-send-email-a.beregalov@gmail.com> <1239835980-22502-2-git-send-email-a.beregalov@gmail.com> <1239835980-22502-3-git-send-email-a.beregalov@gmail.com> <1239835980-22502-4-git-send-email-a.beregalov@gmail.com> <1239835980-22502-5-git-send-email-a.beregalov@gmail.com> <1239835980-22502-6-git-send-email-a.beregalov@gmail.com> <1239835980-22502-7-git-send-email-a.beregalov@gmail.com> <1239835980-22502-8-git-send-email-a.beregalov@gmail.com> <1239835980-22502-9-git-send-email-a.beregalov@gmail.com> <1239835980-22502-10-git-send-email-a.beregalov@gmail.com> <1239835980-22502-11-git-send-email-a.beregalov@gmail.com> <1239835980-22502-12-git-send-email-a.beregalov@gmail.com> <1239835980-22502-13-git-send-email-a.beregalov@gmail.com> <1239835980-22502-14-git-send-email-a.beregalov@gmail.com> <1239835980-22502-15-git-send-email-a.beregalov@gmail.com> <1239835980-22502-16-git-send-email-a.beregalov@gmail.com> <1239835980-22502-17-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/mvme147.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c index 435e5a8..93c709d 100644 --- a/drivers/net/mvme147.c +++ b/drivers/net/mvme147.c @@ -57,6 +57,17 @@ typedef void (*writerap_t)(void *, unsigned short); typedef void (*writerdp_t)(void *, unsigned short); typedef unsigned short (*readrdp_t)(void *); +static const struct net_device_ops lance_netdev_ops = { + .ndo_open = m147lance_open, + .ndo_stop = m147lance_close, + .ndo_start_xmit = lance_start_xmit, + .ndo_set_multicast_list = lance_set_multicast, + .ndo_tx_timeout = lance_tx_timeout, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, +}; + /* Initialise the one and only on-board 7990 */ struct net_device * __init mvme147lance_probe(int unit) { @@ -81,11 +92,7 @@ struct net_device * __init mvme147lance_probe(int unit) /* Fill the dev fields */ dev->base_addr = (unsigned long)MVME147_LANCE_BASE; - dev->open = &m147lance_open; - dev->stop = &m147lance_close; - dev->hard_start_xmit = &lance_start_xmit; - dev->set_multicast_list = &lance_set_multicast; - dev->tx_timeout = &lance_tx_timeout; + dev->netdev_ops = &lance_netdev_ops; dev->dma = 0; addr=(u_long *)ETHERNET_ADDRESS;