aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r--drivers/mtd/maps/physmap_of.c6
-rw-r--r--drivers/mtd/maps/sun_uflash.c2
2 files changed, 4 insertions, 4 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)
143static struct mtd_info * __devinit obsolete_probe(struct of_device *dev, 143static 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 }
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index fadc4c45b455..5945a23e681f 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -110,7 +110,7 @@ int uflash_devinit(struct of_device *op, struct device_node *dp)
110 110
111static int __devinit uflash_probe(struct of_device *op, const struct of_device_id *match) 111static int __devinit uflash_probe(struct of_device *op, const struct of_device_id *match)
112{ 112{
113 struct device_node *dp = op->node; 113 struct device_node *dp = op->dev.of_node;
114 114
115 /* Flashprom must have the "user" property in order to 115 /* Flashprom must have the "user" property in order to
116 * be used by this driver. 116 * be used by this driver.