From patchwork Wed Apr 15 22:52:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26022 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 93974DE205 for ; Thu, 16 Apr 2009 08:53:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756345AbZDOWxX (ORCPT ); Wed, 15 Apr 2009 18:53:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755804AbZDOWxU (ORCPT ); Wed, 15 Apr 2009 18:53:20 -0400 Received: from fk-out-0910.google.com ([209.85.128.186]:22060 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754838AbZDOWxM (ORCPT ); Wed, 15 Apr 2009 18:53:12 -0400 Received: by fk-out-0910.google.com with SMTP id 18so54620fkq.5 for ; Wed, 15 Apr 2009 15:53:10 -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=dBtYUdlXlPT5ZkTpzcWqnei0l8s/ipIEmxrXBg2j6TQ=; b=R97sbjuEBVl9jfrt5t1XJo4SMdgG0onjxdwEazTZIrSogbJfk51VdRfscTOlkEuSqB LB9WLFHKn+RRsPdzbbln1kzSP6M4YXv0GPhJpNILntsadWc+QghgpmZrQmhasz5dOGyq JeCoNikCoh/1PaMUzhOWyf01FkI11Evgw7PSI= 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=j+eAw+DLFHg+y95aDekXfNrrz+i1mCzdUrfviZ17WuvWvlWtja3NOLBnLSoC6b7JiS 21fjKax9Twa31qUrAI0XsDxtzM/DGNT1XvWVmUJASQ5A6RwUseXhE6cbFH18M4id8lzU yoMLPkQfT6wtg+C83F+ehwtrGYxPjOvpy45+4= Received: by 10.103.24.11 with SMTP id b11mr416281muj.76.1239835990697; Wed, 15 Apr 2009 15:53:10 -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.09 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:09 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 07/26] irda/pxaficp_ir: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:41 +0400 Message-Id: <1239835980-22502-7-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-6-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> 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/pxaficp_ir.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index e775338..e8ced56 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c @@ -797,6 +797,16 @@ static int pxa_irda_init_iobuf(iobuff_t *io, int size) return io->head ? 0 : -ENOMEM; } +static const struct net_device_ops pxa_irda_netdev_ops = { + .ndo_open = pxa_irda_start, + .ndo_stop = pxa_irda_stop, + .ndo_start_xmit = pxa_irda_hard_xmit, + .ndo_do_ioctl = pxa_irda_ioctl, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, +}; + static int pxa_irda_probe(struct platform_device *pdev) { struct net_device *dev; @@ -845,10 +855,7 @@ static int pxa_irda_probe(struct platform_device *pdev) if (err) goto err_startup; - dev->hard_start_xmit = pxa_irda_hard_xmit; - dev->open = pxa_irda_start; - dev->stop = pxa_irda_stop; - dev->do_ioctl = pxa_irda_ioctl; + dev->netdev_ops = &pxa_irda_netdev_ops; irda_init_max_qos_capabilies(&si->qos);