xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

software node: remove separate handling of references

Browse Source 
Now that all users of references have moved to reference properties,
we can remove separate handling of references.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Dmitry Torokhov
2019-11-07 20:22:24 -08:00
committed by Rafael J. Wysocki
parent 53c24c2932
commit e933bedd45
2 changed files with 17 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/base/swnode.c
View File

@@ -479,9 +479,8 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode,
struct fwnode_reference_args *args)
{
struct swnode *swnode = to_swnode(fwnode);
const struct software_node_reference *ref;
const struct software_node_ref_args *ref_array;
const struct software_node_ref_args *ref_args;
const struct software_node_ref_args *ref;
const struct property_entry *prop;
struct fwnode_handle *refnode;
u32 nargs_prop_val;
@@ -492,37 +491,26 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode,
return -ENOENT;
prop = property_entry_get(swnode->node->properties, propname);
if (prop) {
if (prop->type != DEV_PROP_REF)
return -EINVAL;
if (!prop)
return -ENOENT;
/*
* We expect that references are never stored inline, even
* single ones, as they are too big.
*/
if (prop->is_inline)
return -EINVAL;
if (prop->type != DEV_PROP_REF)
return -EINVAL;
if (index * sizeof(*ref_args) >= prop->length)
return -ENOENT;
/*
* We expect that references are never stored inline, even
* single ones, as they are too big.
*/
if (prop->is_inline)
return -EINVAL;
ref_array = prop->pointer;
ref_args = &ref_array[index];
} else {
if (!swnode->node->references)
return -ENOENT;
if (index * sizeof(*ref) >= prop->length)
return -ENOENT;
for (ref = swnode->node->references; ref->name; ref++)
if (!strcmp(ref->name, propname))
break;
ref_array = prop->pointer;
ref = &ref_array[index];
if (!ref->name || index > (ref->nrefs - 1))
return -ENOENT;
ref_args = &ref->refs[index];
}
refnode = software_node_fwnode(ref_args->node);
refnode = software_node_fwnode(ref->node);
if (!refnode)
return -ENOENT;
@@ -543,7 +531,7 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode,
args->nargs = nargs;
for (i = 0; i < nargs; i++)
args->args[i] = ref_args->args[i];
args->args[i] = ref->args[i];
return 0;
}