mtd: Convert to using %pOF instead of full_name
Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node. Signed-off-by: Rob Herring <robh@kernel.org> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Brian Norris <computersforpeace@gmail.com> Cc: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Richard Weinberger <richard@nod.at> Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr> Cc: linux-mtd@lists.infradead.org Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
Родитель
ab8d531910
Коммит
1d70607750
|
@ -178,8 +178,8 @@ static int of_flash_probe(struct platform_device *dev)
|
||||||
*/
|
*/
|
||||||
p = of_get_property(dp, "reg", &count);
|
p = of_get_property(dp, "reg", &count);
|
||||||
if (!p || count % reg_tuple_size != 0) {
|
if (!p || count % reg_tuple_size != 0) {
|
||||||
dev_err(&dev->dev, "Malformed reg property on %s\n",
|
dev_err(&dev->dev, "Malformed reg property on %pOF\n",
|
||||||
dev->dev.of_node->full_name);
|
dev->dev.of_node);
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
goto err_flash_remove;
|
goto err_flash_remove;
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,8 +55,8 @@ int uflash_devinit(struct platform_device *op, struct device_node *dp)
|
||||||
/* Non-CFI userflash device-- once I find one we
|
/* Non-CFI userflash device-- once I find one we
|
||||||
* can work on supporting it.
|
* can work on supporting it.
|
||||||
*/
|
*/
|
||||||
printk(KERN_ERR PFX "Unsupported device at %s, 0x%llx\n",
|
printk(KERN_ERR PFX "Unsupported device at %pOF, 0x%llx\n",
|
||||||
dp->full_name, (unsigned long long)op->resource[0].start);
|
dp, (unsigned long long)op->resource[0].start);
|
||||||
|
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,8 +50,8 @@ static int parse_ofpart_partitions(struct mtd_info *master,
|
||||||
* when using another parser), so don't be louder than
|
* when using another parser), so don't be louder than
|
||||||
* KERN_DEBUG
|
* KERN_DEBUG
|
||||||
*/
|
*/
|
||||||
pr_debug("%s: 'partitions' subnode not found on %s. Trying to parse direct subnodes as partitions.\n",
|
pr_debug("%s: 'partitions' subnode not found on %pOF. Trying to parse direct subnodes as partitions.\n",
|
||||||
master->name, mtd_node->full_name);
|
master->name, mtd_node);
|
||||||
ofpart_node = mtd_node;
|
ofpart_node = mtd_node;
|
||||||
dedicated = false;
|
dedicated = false;
|
||||||
} else if (!of_device_is_compatible(ofpart_node, "fixed-partitions")) {
|
} else if (!of_device_is_compatible(ofpart_node, "fixed-partitions")) {
|
||||||
|
@ -87,9 +87,9 @@ static int parse_ofpart_partitions(struct mtd_info *master,
|
||||||
reg = of_get_property(pp, "reg", &len);
|
reg = of_get_property(pp, "reg", &len);
|
||||||
if (!reg) {
|
if (!reg) {
|
||||||
if (dedicated) {
|
if (dedicated) {
|
||||||
pr_debug("%s: ofpart partition %s (%s) missing reg property.\n",
|
pr_debug("%s: ofpart partition %pOF (%pOF) missing reg property.\n",
|
||||||
master->name, pp->full_name,
|
master->name, pp,
|
||||||
mtd_node->full_name);
|
mtd_node);
|
||||||
goto ofpart_fail;
|
goto ofpart_fail;
|
||||||
} else {
|
} else {
|
||||||
nr_parts--;
|
nr_parts--;
|
||||||
|
@ -100,9 +100,9 @@ static int parse_ofpart_partitions(struct mtd_info *master,
|
||||||
a_cells = of_n_addr_cells(pp);
|
a_cells = of_n_addr_cells(pp);
|
||||||
s_cells = of_n_size_cells(pp);
|
s_cells = of_n_size_cells(pp);
|
||||||
if (len / 4 != a_cells + s_cells) {
|
if (len / 4 != a_cells + s_cells) {
|
||||||
pr_debug("%s: ofpart partition %s (%s) error parsing reg property.\n",
|
pr_debug("%s: ofpart partition %pOF (%pOF) error parsing reg property.\n",
|
||||||
master->name, pp->full_name,
|
master->name, pp,
|
||||||
mtd_node->full_name);
|
mtd_node);
|
||||||
goto ofpart_fail;
|
goto ofpart_fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -131,8 +131,8 @@ static int parse_ofpart_partitions(struct mtd_info *master,
|
||||||
return nr_parts;
|
return nr_parts;
|
||||||
|
|
||||||
ofpart_fail:
|
ofpart_fail:
|
||||||
pr_err("%s: error parsing ofpart partition %s (%s)\n",
|
pr_err("%s: error parsing ofpart partition %pOF (%pOF)\n",
|
||||||
master->name, pp->full_name, mtd_node->full_name);
|
master->name, pp, mtd_node);
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
ofpart_none:
|
ofpart_none:
|
||||||
of_node_put(pp);
|
of_node_put(pp);
|
||||||
|
@ -166,8 +166,7 @@ static int parse_ofoldpart_partitions(struct mtd_info *master,
|
||||||
if (!part)
|
if (!part)
|
||||||
return 0; /* No partitions found */
|
return 0; /* No partitions found */
|
||||||
|
|
||||||
pr_warn("Device tree uses obsolete partition map binding: %s\n",
|
pr_warn("Device tree uses obsolete partition map binding: %pOF\n", dp);
|
||||||
dp->full_name);
|
|
||||||
|
|
||||||
nr_parts = plen / sizeof(part[0]);
|
nr_parts = plen / sizeof(part[0]);
|
||||||
|
|
||||||
|
|
|
@ -355,16 +355,16 @@ static int hisi_spi_nor_register(struct device_node *np,
|
||||||
|
|
||||||
ret = of_property_read_u32(np, "reg", &priv->chipselect);
|
ret = of_property_read_u32(np, "reg", &priv->chipselect);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(dev, "There's no reg property for %s\n",
|
dev_err(dev, "There's no reg property for %pOF\n",
|
||||||
np->full_name);
|
np);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = of_property_read_u32(np, "spi-max-frequency",
|
ret = of_property_read_u32(np, "spi-max-frequency",
|
||||||
&priv->clkrate);
|
&priv->clkrate);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(dev, "There's no spi-max-frequency property for %s\n",
|
dev_err(dev, "There's no spi-max-frequency property for %pOF\n",
|
||||||
np->full_name);
|
np);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
priv->host = host;
|
priv->host = host;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче