sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

of_path: Fix bug with partitions, simply code 

In commit 75b682795e using a path that
has a partition description broke.

Fix this and simpfy the code some.

There is no need to loop over each string in the path property:  it's
defined to have at most one parition description, no extant dts has
more than one, and how it would handle more than one didn't make sense
anyway.

Once not looping, __of_find_path() just needs the partition
description text, not both the original node and property name to look
it up from.

When using a partition description, don't lookup the cdev of the node
just to replace it with the partition's cdev.

Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Trent Piepho 2015-12-17 00:52:00 +00:00 committed by Sascha Hauer
parent 91adf62feb
commit 51e97d11dc
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/of/of_path.c
View File

@ -106,12 +106,22 @@ out:
return ret;
}
static int __of_find_path(struct device_node *node, const char *propname, char **outpath, unsigned flags)
/**
* __of_find_path
*
* @node: The node to find the cdev for, can be the device or a
* partition in the device
* @part: Optionally, a description of a parition of @node. See of_find_path
* @outpath: if this function returns 0 outpath will contain the path belonging
* to the input path description. Must be freed with free().
* @flags: use OF_FIND_PATH_FLAGS_BB to return the .bb device if available
*
*/
static int __of_find_path(struct device_node *node, const char *part, char **outpath, unsigned flags)
{
struct of_path op = {};
const char *str;
struct of_path op;
bool add_bb = false;
int i, ret;
int ret;
op.dev = of_find_device_by_node_path(node->full_name);
if (!op.dev) {
@ -122,23 +132,18 @@ static int __of_find_path(struct device_node *node, const char *propname, char *
device_detect(op.dev);
op.cdev = cdev_by_device_node(node);
i = 1;
while (propname) {
ret = of_property_read_string_index(node, propname, i++, &str);
if (ret)
break;
ret = of_path_parse_one(&op, str);
if (part) {
/* Find a partition inside op.dev */
ret = of_path_parse_one(&op, part);
if (ret)
return ret;
} else {
/* node points directly to device */
op.cdev = cdev_by_device_node(node);
if (!op.cdev)
return -ENOENT;
}
if (!op.cdev)
return -ENOENT;
if ((flags & OF_FIND_PATH_FLAGS_BB) && op.cdev->mtd &&
mtd_can_have_bb(op.cdev->mtd))
add_bb = true;
@ -193,6 +198,8 @@ int of_find_path(struct device_node *node, const char *propname, char **outpath,
{
struct device_node *rnode;
const char *path;
const char *part;
int ret;
path = of_get_property(node, propname, NULL);
if (!path)
@ -202,5 +209,9 @@ int of_find_path(struct device_node *node, const char *propname, char **outpath,
if (!rnode)
return -ENODEV;
return __of_find_path(rnode, propname, outpath, flags);
ret = of_property_read_string_index(node, propname, 1, &part);
if (ret)
part = NULL;
return __of_find_path(rnode, part, outpath, flags);
}