From patchwork Sat Mar 21 05:35:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 24856 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 C097FDDED1 for ; Sat, 21 Mar 2009 16:54:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762166AbZCUFxT (ORCPT ); Sat, 21 Mar 2009 01:53:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760936AbZCUFxP (ORCPT ); Sat, 21 Mar 2009 01:53:15 -0400 Received: from suva.vyatta.com ([76.74.103.44]:36571 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760842AbZCUFsP (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 n2L5mAJg027066; Fri, 20 Mar 2009 22:48:10 -0700 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n2L5mAFi027065; Fri, 20 Mar 2009 22:48:10 -0700 Message-Id: <20090321053713.605552151@vyatta.com> References: <20090321053527.316395697@vyatta.com> User-Agent: quilt/0.46-1 Date: Fri, 20 Mar 2009 22:35:41 -0700 From: Stephen Hemminger To: David Miller , samuel@sortiz.org Cc: netdev@vger.kernel.org Subject: [PATCH 14/77] irda: convert vlsi driver to net_device_ops Content-Disposition: inline; filename=irda-vlsi.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 --- drivers/net/irda/vlsi_ir.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) --- a/drivers/net/irda/vlsi_ir.c 2009-03-19 22:40:30.270902366 -0700 +++ b/drivers/net/irda/vlsi_ir.c 2009-03-19 22:42:50.764027628 -0700 @@ -1573,6 +1573,14 @@ static int vlsi_close(struct net_device return 0; } +static const struct net_device_ops vlsi_netdev_ops = { + .ndo_open = vlsi_open, + .ndo_stop = vlsi_close, + .ndo_start_xmit = vlsi_hard_start_xmit, + .ndo_do_ioctl = vlsi_ioctl, + .ndo_tx_timeout = vlsi_tx_timeout, +}; + static int vlsi_irda_init(struct net_device *ndev) { vlsi_irda_dev_t *idev = netdev_priv(ndev); @@ -1608,11 +1616,7 @@ static int vlsi_irda_init(struct net_dev ndev->flags |= IFF_PORTSEL | IFF_AUTOMEDIA; ndev->if_port = IF_PORT_UNKNOWN; - ndev->open = vlsi_open; - ndev->stop = vlsi_close; - ndev->hard_start_xmit = vlsi_hard_start_xmit; - ndev->do_ioctl = vlsi_ioctl; - ndev->tx_timeout = vlsi_tx_timeout; + ndev->netdev_ops = &vlsi_netdev_ops; ndev->watchdog_timeo = 500*HZ/1000; /* max. allowed turn time for IrLAP */ SET_NETDEV_DEV(ndev, &pdev->dev);