From patchwork Thu Mar 11 18:04:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 47497 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DEAA2B7DCE for ; Fri, 12 Mar 2010 05:22:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933536Ab0CKSEK (ORCPT ); Thu, 11 Mar 2010 13:04:10 -0500 Received: from mail-pz0-f194.google.com ([209.85.222.194]:34774 "EHLO mail-pz0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933530Ab0CKSEH (ORCPT ); Thu, 11 Mar 2010 13:04:07 -0500 Received: by mail-pz0-f194.google.com with SMTP id 32so171228pzk.4 for ; Thu, 11 Mar 2010 10:04:06 -0800 (PST) Received: by 10.142.249.10 with SMTP id w10mr1495920wfh.207.1268330646638; Thu, 11 Mar 2010 10:04:06 -0800 (PST) Received: from angua (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) by mx.google.com with ESMTPS id 20sm263221pzk.7.2010.03.11.10.04.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 11 Mar 2010 10:04:05 -0800 (PST) Received: from [127.0.1.1] (unknown [IPv6:::1]) by angua (Postfix) with ESMTP id 04019513; Thu, 11 Mar 2010 11:04:04 -0700 (MST) From: Grant Likely Subject: [PATCH 03/37] of/sparc: use dev->of_node instead of dev->archdata.prom_node To: monstr@monstr.eu, gregkh@suse.de, benh@kernel.crashing.org, akpm@linux-foundation.org, davem@davemloft.net, sfr@canb.auug.org.au, jgarzik@pobox.com, ben-linux@fluff.org, dwmw2@infradead.org, jeremy.kerr@canonical.com, James.Bottomley@suse.de, broonie@opensource.wolfsonmicro.com, microblaze-uclinux@itee.uq.edu.au, linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, sparclinux@vger.kernel.org, linux-ide@vger.kernel.org, netdev@vger.kernel.org, linux-i2c@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-scsi@vger.kernel.org, alsa-devel@alsa-project.org Date: Thu, 11 Mar 2010 11:04:04 -0700 Message-ID: <20100311180403.4824.90589.stgit@angua> In-Reply-To: <20100311174830.4824.19820.stgit@angua> References: <20100311174830.4824.19820.stgit@angua> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org The prom_node pointer is being moved out of archdata to dev->of_node. This patch changes users of prom_node to use the new location. Signed-off-by: Grant Likely --- arch/sparc/include/asm/fb.h | 2 +- arch/sparc/kernel/of_device_32.c | 3 ++- arch/sparc/kernel/of_device_64.c | 3 ++- arch/sparc/kernel/pci.c | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/sparc/include/asm/fb.h b/arch/sparc/include/asm/fb.h index b83e447..e834880 100644 --- a/arch/sparc/include/asm/fb.h +++ b/arch/sparc/include/asm/fb.h @@ -18,7 +18,7 @@ static inline int fb_is_primary_device(struct fb_info *info) struct device *dev = info->device; struct device_node *node; - node = dev->archdata.prom_node; + node = dev->of_node; if (node && node == of_console_device) return 1; diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c index da527b3..5a5509c 100644 --- a/arch/sparc/kernel/of_device_32.c +++ b/arch/sparc/kernel/of_device_32.c @@ -345,8 +345,9 @@ static struct of_device * __init scan_one_device(struct device_node *dp, return NULL; sd = &op->dev.archdata; - sd->prom_node = dp; + sd->prom_node = dp; /* temporary */ sd->op = op; + op->dev.of_node = dp; op->node = dp; diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c index b3d4cb5..9d30b07 100644 --- a/arch/sparc/kernel/of_device_64.c +++ b/arch/sparc/kernel/of_device_64.c @@ -640,9 +640,10 @@ static struct of_device * __init scan_one_device(struct device_node *dp, return NULL; sd = &op->dev.archdata; - sd->prom_node = dp; + sd->prom_node = dp; /* temporary */ sd->op = op; + op->dev.of_node = dp; op->node = dp; op->clock_freq = of_getintprop_default(dp, "clock-frequency", diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index cf73f43..40861ed 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -654,7 +654,7 @@ show_pciobppath_attr(struct device * dev, struct device_attribute * attr, char * struct device_node *dp; pdev = to_pci_dev(dev); - dp = pdev->dev.archdata.prom_node; + dp = pdev->dev.of_node; return snprintf (buf, PAGE_SIZE, "%s\n", dp->full_name); } @@ -1023,7 +1023,7 @@ void arch_teardown_msi_irq(unsigned int virt_irq) struct device_node *pci_device_to_OF_node(struct pci_dev *pdev) { - return pdev->dev.archdata.prom_node; + return pdev->dev.of_node; } EXPORT_SYMBOL(pci_device_to_OF_node);