From patchwork Sat Mar 21 05:35:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 24857 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 57F00DDDB6 for ; Sat, 21 Mar 2009 16:54:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762179AbZCUFxU (ORCPT ); Sat, 21 Mar 2009 01:53:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762045AbZCUFxQ (ORCPT ); Sat, 21 Mar 2009 01:53:16 -0400 Received: from suva.vyatta.com ([76.74.103.44]:36568 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760860AbZCUFsP (ORCPT ); Sat, 21 Mar 2009 01:48:15 -0400 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n2L5m9qB027054; Fri, 20 Mar 2009 22:48:09 -0700 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n2L5m9sM027053; Fri, 20 Mar 2009 22:48:09 -0700 Message-Id: <20090321053713.376037045@vyatta.com> References: <20090321053527.316395697@vyatta.com> User-Agent: quilt/0.46-1 Date: Fri, 20 Mar 2009 22:35:38 -0700 From: Stephen Hemminger To: David Miller , samuel@sortiz.org Cc: netdev@vger.kernel.org Subject: [PATCH 11/77] irda: convert w83977af_ir to net_device_ops Content-Disposition: inline; filename=irda-w.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Stephen Hemminger Acked-by: Samuel Ortiz --- a/drivers/net/irda/w83977af_ir.c 2009-03-19 22:40:30.367964328 -0700 +++ b/drivers/net/irda/w83977af_ir.c 2009-03-19 22:42:48.582901908 -0700 @@ -140,6 +140,13 @@ static void __exit w83977af_cleanup(void } } +static const struct net_device_ops w83977_netdev_ops = { + .ndo_open = w83977af_net_open, + .ndo_stop = w83977af_net_close, + .ndo_start_xmit = w83977af_hard_xmit, + .ndo_do_ioctl = w83977af_net_ioctl, +}; + /* * Function w83977af_open (iobase, irq) * @@ -231,11 +238,7 @@ static int w83977af_open(int i, unsigned self->rx_buff.data = self->rx_buff.head; self->netdev = dev; - /* Override the network functions we need to use */ - dev->hard_start_xmit = w83977af_hard_xmit; - dev->open = w83977af_net_open; - dev->stop = w83977af_net_close; - dev->do_ioctl = w83977af_net_ioctl; + dev->netdev_ops = &w83977_netdev_ops; err = register_netdev(dev); if (err) {