From patchwork Wed Apr 15 17:58:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26009 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 73C37DE057 for ; Thu, 16 Apr 2009 03:59:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752004AbZDOR64 (ORCPT ); Wed, 15 Apr 2009 13:58:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752926AbZDOR6y (ORCPT ); Wed, 15 Apr 2009 13:58:54 -0400 Received: from ti-out-0910.google.com ([209.85.142.190]:29635 "EHLO ti-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752908AbZDOR6w (ORCPT ); Wed, 15 Apr 2009 13:58:52 -0400 Received: by ti-out-0910.google.com with SMTP id 11so6496tim.23 for ; Wed, 15 Apr 2009 10:58:52 -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=/kRP2mv9DuWDLMHGvdaON78LJxVbAAGDlLCSb3SfORg=; b=WIiCaqGYIoZjGiS6YwlxcIqBMi0XI0HG1UHE/zEB5/VFF3m+l2UgFXzkzzohv4bS3O dyC+pqmExVYmtJKR08zeUqtdX06DLQMYBN5+Zs1Qhk5GVoH7snbtwd+cS2G518zkoDWf wbgSkXngCoRblDawlI1uR5oP7CLTWgGlHMnAE= 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=xqZICdxjBYXF7WhkXgPEFB9t1WzEzAmoQ5PnbhP3LmVg0UU6THaAIiVJ1Inov8ixBo 8One4wsr+tmPbcY56UpBgUFFOd7/v86S0QGmpnoT9C/mJ8BwZcGVovilpNl+dlK6HmnW N880lA/x7MTWY8tKi8URpN/Ko6PpZnSUN6dkk= Received: by 10.110.84.7 with SMTP id h7mr402283tib.59.1239818332069; Wed, 15 Apr 2009 10:58:52 -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 u12sm219947tia.6.2009.04.15.10.58.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 10:58:50 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH -next 3/3] 8390(p): remove old compat_net_dev_ops code Date: Wed, 15 Apr 2009 21:58:29 +0400 Message-Id: <1239818309-14899-3-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239818309-14899-2-git-send-email-a.beregalov@gmail.com> References: <1239818309-14899-1-git-send-email-a.beregalov@gmail.com> <1239818309-14899-2-git-send-email-a.beregalov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove compat_net_dev_ops code and use struct net_device_ops instead of it. Signed-off-by: Alexander Beregalov --- drivers/net/8390.c | 10 ++-------- drivers/net/8390p.c | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/net/8390.c b/drivers/net/8390.c index ec3e22e..21153de 100644 --- a/drivers/net/8390.c +++ b/drivers/net/8390.c @@ -74,14 +74,8 @@ EXPORT_SYMBOL(ei_netdev_ops); struct net_device *__alloc_ei_netdev(int size) { struct net_device *dev = ____alloc_ei_netdev(size); -#ifdef CONFIG_COMPAT_NET_DEV_OPS - if (dev) { - dev->hard_start_xmit = ei_start_xmit; - dev->get_stats = ei_get_stats; - dev->set_multicast_list = ei_set_multicast_list; - dev->tx_timeout = ei_tx_timeout; - } -#endif + if (dev) + dev->netdev_ops = &ei_netdev_ops; return dev; } EXPORT_SYMBOL(__alloc_ei_netdev); diff --git a/drivers/net/8390p.c b/drivers/net/8390p.c index da863c9..6ec11da 100644 --- a/drivers/net/8390p.c +++ b/drivers/net/8390p.c @@ -79,14 +79,8 @@ EXPORT_SYMBOL(eip_netdev_ops); struct net_device *__alloc_eip_netdev(int size) { struct net_device *dev = ____alloc_ei_netdev(size); -#ifdef CONFIG_COMPAT_NET_DEV_OPS - if (dev) { - dev->hard_start_xmit = eip_start_xmit; - dev->get_stats = eip_get_stats; - dev->set_multicast_list = eip_set_multicast_list; - dev->tx_timeout = eip_tx_timeout; - } -#endif + if (dev) + dev->netdev_ops = &eip_netdev_ops; return dev; } EXPORT_SYMBOL(__alloc_eip_netdev);