linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Grant Likely <grant.likely@secretlab.ca>
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
Subject: [PATCH 09/37] drivers/atm: use .dev.of_node instead of .node in struct of_device
Date: Thu, 11 Mar 2010 11:04:37 -0700	[thread overview]
Message-ID: <20100311180437.4824.86345.stgit@angua> (raw)
In-Reply-To: <20100311174830.4824.19820.stgit@angua>

.node is being removed

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

 drivers/atm/fore200e.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index f7d6eba..593a03a 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -789,7 +789,7 @@ static int __init fore200e_sba_map(struct fore200e *fore200e)
 	fore200e->bus->write(0x02, fore200e->regs.sba.isr); /* XXX hardwired interrupt level */
 
 	/* get the supported DVMA burst sizes */
-	bursts = of_getintprop_default(op->node->parent, "burst-sizes", 0x00);
+	bursts = of_getintprop_default(op->dev.of_node->parent, "burst-sizes", 0x00);
 
 	if (sbus_can_dma_64bit())
 		sbus_set_sbus64(&op->dev, bursts);
@@ -820,18 +820,20 @@ static int __init fore200e_sba_prom_read(struct fore200e *fore200e, struct prom_
 	const u8 *prop;
 	int len;
 
-	prop = of_get_property(op->node, "madaddrlo2", &len);
+	prop = of_get_property(op->dev.of_node, "madaddrlo2", &len);
 	if (!prop)
 		return -ENODEV;
 	memcpy(&prom->mac_addr[4], prop, 4);
 
-	prop = of_get_property(op->node, "madaddrhi4", &len);
+	prop = of_get_property(op->dev.of_node, "madaddrhi4", &len);
 	if (!prop)
 		return -ENODEV;
 	memcpy(&prom->mac_addr[2], prop, 4);
 
-	prom->serial_number = of_getintprop_default(op->node, "serialnumber", 0);
-	prom->hw_revision = of_getintprop_default(op->node, "promversion", 0);
+	prom->serial_number = of_getintprop_default(op->dev.of_node,
+						    "serialnumber", 0);
+	prom->hw_revision = of_getintprop_default(op->dev.of_node,
+						  "promversion", 0);
     
 	return 0;
 }
@@ -841,10 +843,10 @@ static int fore200e_sba_proc_read(struct fore200e *fore200e, char *page)
 	struct of_device *op = fore200e->bus_dev;
 	const struct linux_prom_registers *regs;
 
-	regs = of_get_property(op->node, "reg", NULL);
+	regs = of_get_property(op->dev.of_node, "reg", NULL);
 
 	return sprintf(page, "   SBUS slot/device:\t\t%d/'%s'\n",
-		       (regs ? regs->which_io : 0), op->node->name);
+		       (regs ? regs->which_io : 0), op->dev.of_node->name);
 }
 #endif /* CONFIG_SBUS */
 

  parent reply	other threads:[~2010-03-11 18:04 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-11 18:03 [PATCH 00/37] OF: move device node pointer into struct device Grant Likely
2010-03-11 18:03 ` [PATCH 01/37] i2c/of: Allow device node to be passed via i2c_board_info Grant Likely
2010-03-11 18:03 ` [PATCH 02/37] of: Eliminate dev_archdata_get_node() Grant Likely
2010-03-11 18:04 ` [PATCH 03/37] of/sparc: use dev->of_node instead of dev->archdata.prom_node Grant Likely
2010-03-11 18:04 ` [PATCH 04/37] arch/sparc: use .dev.of_node instead of .node in struct of_device Grant Likely
2010-03-11 18:04 ` [PATCH 05/37] arch/powerpc: " Grant Likely
2010-03-11 18:04 ` [PATCH 06/37] arch/microblaze: " Grant Likely
2010-03-11 18:04 ` [PATCH 07/37] drivers/serial: " Grant Likely
2010-03-11 18:04 ` [PATCH 08/37] drivers/watchdog: " Grant Likely
2010-03-11 18:04 ` Grant Likely [this message]
2010-03-11 18:04 ` [PATCH 10/37] drivers/video: " Grant Likely
2010-03-11 18:04 ` [PATCH 11/37] drivers/scsi: " Grant Likely
2010-03-11 18:04 ` [PATCH 12/37] drivers/usb: " Grant Likely
2010-03-11 18:28   ` Greg KH
2010-03-11 18:04 ` [PATCH 13/37] drivers/macintosh: " Grant Likely
2010-03-11 18:05 ` [PATCH 14/37] drivers/spi: " Grant Likely
2010-03-11 18:05 ` [PATCH 15/37] drivers/mmc: " Grant Likely
2010-03-11 18:05 ` [PATCH 16/37] drivers/sbus: " Grant Likely
2010-03-11 18:05 ` [PATCH 17/37] drivers/net: " Grant Likely
2010-03-11 18:05 ` [PATCH 18/37] drivers/pcmcia: " Grant Likely
2010-03-11 18:05 ` [PATCH 19/37] drivers/serial: " Grant Likely
2010-03-11 18:05 ` [PATCH 20/37] drivers/input: " Grant Likely
2010-03-11 18:05 ` [PATCH 21/37] drivers/ata: " Grant Likely
2010-03-11 18:31   ` Sergei Shtylyov
2010-03-11 18:36     ` Jeff Garzik
2010-03-11 18:38     ` David Miller
2010-03-11 18:05 ` [PATCH 22/37] drivers/leds: " Grant Likely
2010-03-11 18:05 ` [PATCH 23/37] drivers/i2c: " Grant Likely
2010-03-11 18:06 ` [PATCH 24/37] drivers/char: " Grant Likely
2010-03-11 18:06 ` [PATCH 25/37] drivers/infiniband: " Grant Likely
2010-03-11 19:57   ` Roland Dreier
2010-03-12 13:30     ` Alexander Schmidt
2010-03-11 18:06 ` [PATCH 26/37] drivers/mtd: " Grant Likely
2010-03-11 18:06 ` [PATCH 27/37] drivers/of: " Grant Likely
2010-03-11 18:06 ` [PATCH 28/37] drivers/scsi: use .of_node instead of .archdata.of_node in struct device Grant Likely
2010-03-11 18:06 ` [PATCH 29/37] drivers/char: " Grant Likely
2010-03-11 18:06 ` [PATCH 30/37] drivers/cdrom: " Grant Likely
2010-03-11 18:06 ` [PATCH 31/37] drivers/of: " Grant Likely
2010-03-11 18:06 ` [PATCH 32/37] sound/aoa: use .dev.of_node instead of .node in struct of_device Grant Likely
2010-03-11 18:06 ` [PATCH 33/37] sound/soc: " Grant Likely
2010-03-11 19:34   ` Mark Brown
2010-03-11 21:22     ` Grant Likely
2010-03-12  8:26       ` Jean Delvare
2010-04-05 23:03   ` Ben Dooks
2010-04-05 23:47     ` Grant Likely
2010-03-11 18:06 ` [PATCH 34/37] sound/sparc: " Grant Likely
2010-03-11 18:07 ` [PATCH 35/37] arch/powerpc: Remove .archdata.of_node and use .of_node in struct device Grant Likely
2010-03-11 18:07 ` [PATCH 36/37] arch/microblaze: " Grant Likely
2010-03-11 18:07 ` [PATCH 37/37] arch/sparc: " Grant Likely
2010-03-11 18:20 ` [PATCH 00/37] OF: move device node pointer into " David Miller
2010-03-11 18:23   ` David Miller
2010-03-11 18:25     ` Grant Likely
2010-03-11 18:27       ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100311180437.4824.86345.stgit@angua \
    --to=grant.likely@secretlab.ca \
    --cc=James.Bottomley@suse.de \
    --cc=akpm@linux-foundation.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=ben-linux@fluff.org \
    --cc=benh@kernel.crashing.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=davem@davemloft.net \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=dwmw2@infradead.org \
    --cc=gregkh@suse.de \
    --cc=jeremy.kerr@canonical.com \
    --cc=jgarzik@pobox.com \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=microblaze-uclinux@itee.uq.edu.au \
    --cc=monstr@monstr.eu \
    --cc=netdev@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=sparclinux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).