From patchwork Wed Apr 15 22:52:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26032 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 0CE12DE13C for ; Thu, 16 Apr 2009 08:54:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756783AbZDOWxq (ORCPT ); Wed, 15 Apr 2009 18:53:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756767AbZDOWxo (ORCPT ); Wed, 15 Apr 2009 18:53:44 -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 S1755980AbZDOWxW (ORCPT ); Wed, 15 Apr 2009 18:53:22 -0400 Received: by mail-bw0-f169.google.com with SMTP id 17so114640bwz.37 for ; Wed, 15 Apr 2009 15:53:22 -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=mfhxlb1sg9EriwBRLaSNcV91W9XCvuinXjReLqPmVk0=; b=IDbtCi3YGexnNOgfqIB2yHeIaPB5jzhqTPf+21q7+KL99Jvidm2RZbmZz5PucQp/7j x2hXSIkeB6eE+XzJIZCmGnc1zB/ksZwyve7h+f6VguUNizJCQY5Cw0q936mv0rHCsfDY 4f2+JwzkIQN3alOk8ZGgbVpmHUkxSmMeEJ6eo= 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=i4NP8Qx20+7GqI76M7iTW/49QaBNeHxyzLOJlPdaJ62qLwV4ZaczD3YCHHWTTFlGnz zlQtBK28hk62RV8j7Zn/bahQ5Cy5QIEJ3trIky9aGAwmXbc7Nvo72uldc4JHbunVMDNH ZS1OHMDeNpu1VcReQJ+RHa1UbO7h73gkMtMjs= Received: by 10.103.223.2 with SMTP id a2mr412820mur.88.1239836002035; Wed, 15 Apr 2009 15:53:22 -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.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:21 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 15/26] macmace: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:49 +0400 Message-Id: <1239835980-22502-15-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-14-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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/macmace.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c index 274e99b..44f3c28 100644 --- a/drivers/net/macmace.c +++ b/drivers/net/macmace.c @@ -180,6 +180,17 @@ static void mace_dma_off(struct net_device *dev) psc_write_word(PSC_ENETWR_CMD + PSC_SET1, 0x1100); } +static const struct net_device_ops mace_netdev_ops = { + .ndo_open = mace_open, + .ndo_stop = mace_close, + .ndo_start_xmit = mace_xmit_start, + .ndo_tx_timeout = mace_tx_timeout, + .ndo_set_multicast_list = mace_set_multicast, + .ndo_set_mac_address = mace_set_address, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, +}; + /* * Not really much of a probe. The hardware table tells us if this * model of Macintrash has a MACE (AV macintoshes) @@ -240,13 +251,8 @@ static int __devinit mace_probe(struct platform_device *pdev) return -ENODEV; } - dev->open = mace_open; - dev->stop = mace_close; - dev->hard_start_xmit = mace_xmit_start; - dev->tx_timeout = mace_tx_timeout; + dev->netdev_ops = &mace_netdev_ops; dev->watchdog_timeo = TX_TIMEOUT; - dev->set_multicast_list = mace_set_multicast; - dev->set_mac_address = mace_set_address; printk(KERN_INFO "%s: 68K MACE, hardware address %pM\n", dev->name, dev->dev_addr);