From patchwork Fri Apr 10 03:25:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25825 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 2CACDDE1FA for ; Fri, 10 Apr 2009 13:25:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763320AbZDJDZc (ORCPT ); Thu, 9 Apr 2009 23:25:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763126AbZDJDZb (ORCPT ); Thu, 9 Apr 2009 23:25:31 -0400 Received: from fg-out-1718.google.com ([72.14.220.156]:40071 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762996AbZDJDZb (ORCPT ); Thu, 9 Apr 2009 23:25:31 -0400 Received: by fg-out-1718.google.com with SMTP id e12so281745fga.17 for ; Thu, 09 Apr 2009 20:25:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=rFC02Wz3jqfK8k/jtuCX0TM1ih90iq1QRije9bynGDU=; b=kBfg0+RrT9t3323S6hzUCqf54AGRGVOmLDOSRcHwrwq8NCFd4ZHA0TIoMLMJx6PugJ rVG2/plji8hxTKDOTJVmLTGDBaBea4wZyfVEJEgXCvgdeo/YvjG5uv4mygoq5lm5Wsm/ zQ+Kmlgt9QbKXlt+NnLBlpdJSXouHgGTM357s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=SLsLKErw/xp9HEJbraXhl58vA6tJ3fIF8EREVl2A1g/m6fNTDDUQhnQ7ffuQFs8+A+ uQ71EMHy+YP7tzzu4hiVZKo/+E0XqTantnzIRuJeSRjSW8ReJ0ZoVBlZCPDELFgMT/HS StKNEtXlvfqqwN2JS4ChIicQrRVO5rx3l4Kv0= Received: by 10.86.61.16 with SMTP id j16mr2263531fga.14.1239333929030; Thu, 09 Apr 2009 20:25:29 -0700 (PDT) Received: from orion ([91.78.23.81]) by mx.google.com with ESMTPS id 4sm1580774fgg.5.2009.04.09.20.25.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 09 Apr 2009 20:25:28 -0700 (PDT) Date: Fri, 10 Apr 2009 07:25:25 +0400 From: Alexander Beregalov To: netdev@vger.kernel.org, linux-arm-kernel@lists.arm.linux.org.uk Subject: [PATCH 2/6] am79c961a: convert to net_device_ops Message-ID: <20090410032525.GB9004@orion> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/arm/am79c961a.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c index 4bc6901..627bc75 100644 --- a/drivers/net/arm/am79c961a.c +++ b/drivers/net/arm/am79c961a.c @@ -665,6 +665,20 @@ static void __init am79c961_banner(void) if (net_debug && version_printed++ == 0) printk(KERN_INFO "%s", version); } +static const struct net_device_ops am79c961_netdev_ops = { + .ndo_open = am79c961_open, + .ndo_stop = am79c961_close, + .ndo_start_xmit = am79c961_sendpacket, + .ndo_get_stats = am79c961_getstats, + .ndo_set_multicast_list = am79c961_setmulticastlist, + .ndo_tx_timeout = am79c961_timeout, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = am79c961_poll_controller, +#endif +}; static int __init am79c961_probe(struct platform_device *pdev) { @@ -732,15 +746,7 @@ static int __init am79c961_probe(struct platform_device *pdev) if (am79c961_hw_init(dev)) goto release; - dev->open = am79c961_open; - dev->stop = am79c961_close; - dev->hard_start_xmit = am79c961_sendpacket; - dev->get_stats = am79c961_getstats; - dev->set_multicast_list = am79c961_setmulticastlist; - dev->tx_timeout = am79c961_timeout; -#ifdef CONFIG_NET_POLL_CONTROLLER - dev->poll_controller = am79c961_poll_controller; -#endif + dev->netdev_ops = &am79c961_netdev_ops; ret = register_netdev(dev); if (ret == 0) {