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@infrade
Subject: [PATCH 27/37] drivers/of: use .dev.of_node instead of .node in struct of_device
Date: Thu, 11 Mar 2010 11:06:17 -0700 [thread overview]
Message-ID: <20100311180616.4824.50413.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/of/device.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 224ae6b..24068bb 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -21,9 +21,9 @@
const struct of_device_id *of_match_device(const struct of_device_id *matches,
const struct of_device *dev)
{
- if (!dev->node)
+ if (!dev->dev.of_node)
return NULL;
- return of_match_node(matches, dev->node);
+ return of_match_node(matches, dev->dev.of_node);
}
EXPORT_SYMBOL(of_match_device);
@@ -54,7 +54,7 @@ static ssize_t devspec_show(struct device *dev,
struct of_device *ofdev;
ofdev = to_of_device(dev);
- return sprintf(buf, "%s\n", ofdev->node->full_name);
+ return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name);
}
static ssize_t name_show(struct device *dev,
@@ -63,7 +63,7 @@ static ssize_t name_show(struct device *dev,
struct of_device *ofdev;
ofdev = to_of_device(dev);
- return sprintf(buf, "%s\n", ofdev->node->name);
+ return sprintf(buf, "%s\n", ofdev->dev.of_node->name);
}
static ssize_t modalias_show(struct device *dev,
@@ -97,14 +97,14 @@ void of_release_dev(struct device *dev)
struct of_device *ofdev;
ofdev = to_of_device(dev);
- of_node_put(ofdev->node);
+ of_node_put(ofdev->dev.of_node);
kfree(ofdev);
}
EXPORT_SYMBOL(of_release_dev);
int of_device_register(struct of_device *ofdev)
{
- BUG_ON(ofdev->node == NULL);
+ BUG_ON(ofdev->dev.of_node == NULL);
device_initialize(&ofdev->dev);
@@ -112,7 +112,7 @@ int of_device_register(struct of_device *ofdev)
* the parent. If there is no parent defined, set the node
* explicitly */
if (!ofdev->dev.parent)
- set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->node));
+ set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node));
return device_add(&ofdev->dev);
}
@@ -132,11 +132,11 @@ ssize_t of_device_get_modalias(struct of_device *ofdev,
ssize_t tsize, csize, repend;
/* Name & Type */
- csize = snprintf(str, len, "of:N%sT%s",
- ofdev->node->name, ofdev->node->type);
+ csize = snprintf(str, len, "of:N%sT%s", ofdev->dev.of_node->name,
+ ofdev->dev.of_node->type);
/* Get compatible property if any */
- compat = of_get_property(ofdev->node, "compatible", &cplen);
+ compat = of_get_property(ofdev->dev.of_node, "compatible", &cplen);
if (!compat)
return csize;
next prev parent reply other threads:[~2010-03-11 18:06 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20100311174830.4824.19820.stgit@angua>
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 ` [PATCH 09/37] drivers/atm: " Grant Likely
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: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: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 18:06 ` [PATCH 26/37] drivers/mtd: " Grant Likely
2010-03-11 18:06 ` Grant Likely [this message]
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 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
[not found] ` <20100311180453.4824.61269.stgit@angua>
2010-03-11 18:28 ` [PATCH 12/37] drivers/usb: use .dev.of_node instead of .node in struct of_device Greg KH
[not found] ` <20100311180543.4824.70491.stgit@angua>
2010-03-11 18:31 ` [PATCH 21/37] drivers/ata: " Sergei Shtylyov
2010-03-11 18:36 ` Jeff Garzik
2010-03-11 18:38 ` David Miller
[not found] ` <20100311180605.4824.3613.stgit@angua>
2010-03-11 19:57 ` [PATCH 25/37] drivers/infiniband: " Roland Dreier
2010-03-12 13:30 ` Alexander Schmidt
[not found] ` <20100311180649.4824.10368.stgit@angua>
2010-03-11 19:34 ` [PATCH 33/37] sound/soc: " Mark Brown
2010-03-11 21:22 ` Grant Likely
2010-03-12 8:26 ` Jean Delvare
2010-04-05 23:03 ` Ben Dooks
[not found] ` <20100405230301.GF32401-elnMNo+KYs3pIgCt6eIbzw@public.gmane.org>
2010-04-05 23:47 ` Grant Likely
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=20100311180616.4824.50413.stgit@angua \
--to=grant.likely@secretlab.ca \
--cc=akpm@linux-foundation.org \
--cc=ben-linux@fluff.org \
--cc=benh@kernel.crashing.org \
--cc=davem@davemloft.net \
--cc=dwmw2@infrade \
--cc=gregkh@suse.de \
--cc=jgarzik@pobox.com \
--cc=monstr@monstr.eu \
--cc=sfr@canb.auug.org.au \
/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).