diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-04-13 19:12:29 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-18 18:10:44 -0400 |
commit | 61c7a080a5a061c976988fd4b844dfb468dda255 (patch) | |
tree | 8cb492b73f2755c38a6164d770da34d5af6486a0 /drivers/mtd/maps/physmap_of.c | |
parent | d12d42f744f805a9ccc33cd76f04b237cd83ce56 (diff) |
of: Always use 'struct device.of_node' to get device node pointer.
The following structure elements duplicate the information in
'struct device.of_node' and so are being eliminated. This patch
makes all readers of these elements use device.of_node instead.
(struct of_device *)->node
(struct dev_archdata *)->prom_node (sparc)
(struct dev_archdata *)->of_node (powerpc & microblaze)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/mtd/maps/physmap_of.c')
-rw-r--r-- | drivers/mtd/maps/physmap_of.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c index 101ee6ead05c..3dc7a2fbf025 100644 --- a/drivers/mtd/maps/physmap_of.c +++ b/drivers/mtd/maps/physmap_of.c | |||
@@ -143,7 +143,7 @@ static int of_flash_remove(struct of_device *dev) | |||
143 | static struct mtd_info * __devinit obsolete_probe(struct of_device *dev, | 143 | static struct mtd_info * __devinit obsolete_probe(struct of_device *dev, |
144 | struct map_info *map) | 144 | struct map_info *map) |
145 | { | 145 | { |
146 | struct device_node *dp = dev->node; | 146 | struct device_node *dp = dev->dev.of_node; |
147 | const char *of_probe; | 147 | const char *of_probe; |
148 | struct mtd_info *mtd; | 148 | struct mtd_info *mtd; |
149 | static const char *rom_probe_types[] | 149 | static const char *rom_probe_types[] |
@@ -180,7 +180,7 @@ static int __devinit of_flash_probe(struct of_device *dev, | |||
180 | static const char *part_probe_types[] | 180 | static const char *part_probe_types[] |
181 | = { "cmdlinepart", "RedBoot", NULL }; | 181 | = { "cmdlinepart", "RedBoot", NULL }; |
182 | #endif | 182 | #endif |
183 | struct device_node *dp = dev->node; | 183 | struct device_node *dp = dev->dev.of_node; |
184 | struct resource res; | 184 | struct resource res; |
185 | struct of_flash *info; | 185 | struct of_flash *info; |
186 | const char *probe_type = match->data; | 186 | const char *probe_type = match->data; |
@@ -204,7 +204,7 @@ static int __devinit of_flash_probe(struct of_device *dev, | |||
204 | p = of_get_property(dp, "reg", &count); | 204 | p = of_get_property(dp, "reg", &count); |
205 | if (count % reg_tuple_size != 0) { | 205 | if (count % reg_tuple_size != 0) { |
206 | dev_err(&dev->dev, "Malformed reg property on %s\n", | 206 | dev_err(&dev->dev, "Malformed reg property on %s\n", |
207 | dev->node->full_name); | 207 | dev->dev.of_node->full_name); |
208 | err = -EINVAL; | 208 | err = -EINVAL; |
209 | goto err_flash_remove; | 209 | goto err_flash_remove; |
210 | } | 210 | } |