From patchwork Wed Apr 15 22:52:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26023 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 3B7A1DE204 for ; Thu, 16 Apr 2009 08:53:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756498AbZDOWx0 (ORCPT ); Wed, 15 Apr 2009 18:53:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755664AbZDOWxX (ORCPT ); Wed, 15 Apr 2009 18:53:23 -0400 Received: from mu-out-0910.google.com ([209.85.134.185]:46923 "EHLO mu-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753524AbZDOWxO (ORCPT ); Wed, 15 Apr 2009 18:53:14 -0400 Received: by mu-out-0910.google.com with SMTP id g7so51282muf.1 for ; Wed, 15 Apr 2009 15:53:12 -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=qUQwh/LRB6woD/916vPQsWL0jEBfURLcboES46LhvMA=; b=dZhq5Li11Z9VYYkNYiGp9j1flW7khFdAURZbAGHYPPhmSzaEFnlPqot8flwH1y4wZ9 fk6HyeL1nEdTSz3t0jRY6u4ciJe+KaQhVaiEpoxVt8sVNwIKi7W4EdpQ1tqAHG6PkTr/ CyS5qRSc4lJfsFbYvtg/qKS4lREjpR7mxBMc4= 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=qBmvhlCYtU28ZjeDOk2yrbBQ/DqogiNHE44A8XzP5T5O2aIisk/5N1qRaOdBSeCWsF 8lfxrnHkXVnDFAvlm1uHT0AJKxPy+InBdMQH4/jLQYcp0ZjiGYLyf1BcZ3Wk/y3hYWnY nFyg2Mfd1qSgbLWK5SvCkdwWubv1Dyn0DLXNE= Received: by 10.103.240.15 with SMTP id s15mr410252mur.102.1239835992339; Wed, 15 Apr 2009 15:53:12 -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.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:11 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 08/26] irda/sa1100_ir: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:42 +0400 Message-Id: <1239835980-22502-8-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-7-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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/irda/sa1100_ir.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index 7a2b003..44a748e 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c @@ -875,6 +875,16 @@ static int sa1100_irda_init_iobuf(iobuff_t *io, int size) return io->head ? 0 : -ENOMEM; } +static const struct net_device_ops sa1100_irda_netdev_ops = { + .ndo_open = sa1100_irda_start, + .ndo_stop = sa1100_irda_stop, + .ndo_start_xmit = sa1100_irda_hard_xmit, + .ndo_do_ioctl = sa1100_irda_ioctl, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, +}; + static int sa1100_irda_probe(struct platform_device *pdev) { struct net_device *dev; @@ -913,11 +923,8 @@ static int sa1100_irda_probe(struct platform_device *pdev) if (err) goto err_mem_5; - dev->hard_start_xmit = sa1100_irda_hard_xmit; - dev->open = sa1100_irda_start; - dev->stop = sa1100_irda_stop; - dev->do_ioctl = sa1100_irda_ioctl; - dev->irq = IRQ_Ser2ICP; + dev->netdev_ops = &sa1100_irda_netdev_ops; + dev->ir = IRQ_Ser2ICP; irda_init_max_qos_capabilies(&si->qos);