From patchwork Tue Dec 9 01:32:41 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianjun kong X-Patchwork-Id: 12875 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 559E8DDEDA for ; Tue, 9 Dec 2008 12:32:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751279AbYLIBcu (ORCPT ); Mon, 8 Dec 2008 20:32:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751275AbYLIBct (ORCPT ); Mon, 8 Dec 2008 20:32:49 -0500 Received: from smtp.zeuux.org ([210.51.160.52]:58894 "EHLO z.billxu.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751076AbYLIBct (ORCPT ); Mon, 8 Dec 2008 20:32:49 -0500 Received: from localhost (localhost [127.0.0.1]) by z.billxu.com (Postfix) with ESMTP id 037F8735CC8; Tue, 9 Dec 2008 09:32:44 +0800 (CST) Received: from localhost (unknown [221.11.17.130]) by z.billxu.com (Postfix) with ESMTP id 86B85735CC5; Tue, 9 Dec 2008 09:32:39 +0800 (CST) Date: Tue, 9 Dec 2008 09:32:41 +0800 From: Jianjun Kong To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH] net: Kill directly reference of netdev->priv Message-ID: <20081209013241.GA15483@ubuntu> References: <20081208145333.GB6830@ubuntu> <20081208.122742.46904963.davem@davemloft.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20081208.122742.46904963.davem@davemloft.net> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org another new patch for net-next-2.6 --- From fbd6be20695810f32aa58a5cd889f959d87a019f Mon Sep 17 00:00:00 2001 From: Jianjun Kong Date: Tue, 9 Dec 2008 09:23:54 +0800 Subject: [PATCH] net: Kill directly reference of netdev->priv drivers/net/wireless/ray_cs.c: Replace "(struct net_device *)link->priv" with "netdev_priv((struct net_device *)link)" Signed-off-by: Jianjun Kong --- drivers/net/wireless/ray_cs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 81b71f0..828aa47 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -412,7 +412,7 @@ static int ray_config(struct pcmcia_device *link) int i; win_req_t req; memreq_t mem; - struct net_device *dev = (struct net_device *)link->priv; + struct net_device *dev = netdev_priv((struct net_device *)link); ray_dev_t *local = netdev_priv(dev); DEBUG(1, "ray_config(0x%p)\n", link); @@ -784,7 +784,7 @@ static void join_net(u_long data) =============================================================================*/ static void ray_release(struct pcmcia_device *link) { - struct net_device *dev = link->priv; + struct net_device *dev = netdev_priv((struct net_device *)link); ray_dev_t *local = netdev_priv(dev); int i; @@ -807,7 +807,7 @@ static void ray_release(struct pcmcia_device *link) static int ray_suspend(struct pcmcia_device *link) { - struct net_device *dev = link->priv; + struct net_device *dev = netdev_priv((struct net_device *)link); if (link->open) netif_device_detach(dev); @@ -817,7 +817,7 @@ static int ray_suspend(struct pcmcia_device *link) static int ray_resume(struct pcmcia_device *link) { - struct net_device *dev = link->priv; + struct net_device *dev = netdev_priv((struct net_device *)link); if (link->open) { ray_reset(dev); @@ -2505,7 +2505,7 @@ static void associate(ray_dev_t *local) { struct ccs __iomem *pccs; struct pcmcia_device *link = local->finder; - struct net_device *dev = link->priv; + struct net_device *dev = netdev_priv((struct net_device *)link); int ccsindex; if (!(pcmcia_dev_present(link))) { DEBUG(2,"ray_cs associate - device not present\n"); @@ -2597,7 +2597,7 @@ static int ray_cs_proc_show(struct seq_file *m, void *v) link = this_device; if (!link) return 0; - dev = (struct net_device *)link->priv; + dev = netdev_priv((struct net_device *)link); if (!dev) return 0; local = netdev_priv(dev);