leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: Update of_remove_property() call sites to remove null checking

Browse Source 
After obtaining a property from of_find_property() and before calling
of_remove_property() most code checks to ensure that the property
returned from of_find_property() is not null. The previous patch moved
this check to the start of the function of_remove_property() in order to
avoid the case where this check isn't done and a null value is passed.
This ensures the check is always conducted before taking locks and
attempting to remove the property. Thus it is no longer necessary to
perform a check for null values before invoking of_remove_property().

Update of_remove_property() call sites in order to remove redundant
checking for null property value as check is now performed within the
of_remove_property function().

Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
[mpe: Unbreak some lines which are just >80 chars for readability]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Suraj Jitindar Singh 2016-04-28 15:34:55 +10:00 committed by Michael Ellerman
parent 201b3fe586
commit 925e2d1ded
4 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/powerpc/kernel/machine_kexec.c
View File

@ -228,17 +228,12 @@ static struct property memory_limit_prop = {
static void __init export_crashk_values(struct device_node *node) static void __init export_crashk_values(struct device_node *node)
{ {
struct property *prop;
/* There might be existing crash kernel properties, but we can't /* There might be existing crash kernel properties, but we can't
* be sure what's in them, so remove them. */ * be sure what's in them, so remove them. */
prop = of_find_property(node, "linux,crashkernel-base", NULL); of_remove_property(node, of_find_property(node,
if (prop) "linux,crashkernel-base", NULL));
of_remove_property(node, prop); of_remove_property(node, of_find_property(node,
"linux,crashkernel-size", NULL));
prop = of_find_property(node, "linux,crashkernel-size", NULL);
if (prop)
of_remove_property(node, prop);
if (crashk_res.start != 0) { if (crashk_res.start != 0) {
crashk_base = cpu_to_be_ulong(crashk_res.start), crashk_base = cpu_to_be_ulong(crashk_res.start),
@ -258,16 +253,13 @@ static void __init export_crashk_values(struct device_node *node)
static int __init kexec_setup(void) static int __init kexec_setup(void)
{ {
struct device_node *node; struct device_node *node;
struct property *prop;
node = of_find_node_by_path("/chosen"); node = of_find_node_by_path("/chosen");
if (!node) if (!node)
return -ENOENT; return -ENOENT;
/* remove any stale properties so ours can be found */ /* remove any stale properties so ours can be found */
prop = of_find_property(node, kernel_end_prop.name, NULL); of_remove_property(node, of_find_property(node, kernel_end_prop.name, NULL));
if (prop)
of_remove_property(node, prop);
/* information needed by userspace when using default_machine_kexec */ /* information needed by userspace when using default_machine_kexec */
kernel_end = cpu_to_be_ulong(__pa(_end)); kernel_end = cpu_to_be_ulong(__pa(_end));

9
arch/powerpc/kernel/machine_kexec_64.c
View File

@ -403,7 +403,6 @@ static struct property htab_size_prop = {
static int __init export_htab_values(void) static int __init export_htab_values(void)
{ {
struct device_node *node; struct device_node *node;
struct property *prop;
/* On machines with no htab htab_address is NULL */ /* On machines with no htab htab_address is NULL */
if (!htab_address) if (!htab_address)
@ -414,12 +413,8 @@ static int __init export_htab_values(void)
return -ENODEV; return -ENODEV;
/* remove any stale propertys so ours can be found */ /* remove any stale propertys so ours can be found */
prop = of_find_property(node, htab_base_prop.name, NULL); of_remove_property(node, of_find_property(node, htab_base_prop.name, NULL));
if (prop) of_remove_property(node, of_find_property(node, htab_size_prop.name, NULL));
of_remove_property(node, prop);
prop = of_find_property(node, htab_size_prop.name, NULL);
if (prop)
of_remove_property(node, prop);
htab_base = cpu_to_be64(__pa(htab_address)); htab_base = cpu_to_be64(__pa(htab_address));
of_add_property(node, &htab_base_prop); of_add_property(node, &htab_base_prop);

4
arch/powerpc/platforms/pseries/mobility.c
View File

@ -191,8 +191,8 @@ static int update_dt_node(__be32 phandle, s32 scope)
break; break;
case 0x80000000: case 0x80000000:
prop = of_find_property(dn, prop_name, NULL); of_remove_property(dn, of_find_property(dn,
of_remove_property(dn, prop); prop_name, NULL));
prop = NULL; prop = NULL;
break; break;

5
arch/powerpc/platforms/pseries/reconfig.c
View File

@ -303,7 +303,6 @@ static int do_remove_property(char *buf, size_t bufsize)
{ {
struct device_node *np; struct device_node *np;
char *tmp; char *tmp;
struct property *prop;
buf = parse_node(buf, bufsize, &np); buf = parse_node(buf, bufsize, &np);
if (!np) if (!np)
@ -316,9 +315,7 @@ static int do_remove_property(char *buf, size_t bufsize)
if (strlen(buf) == 0) if (strlen(buf) == 0)
return -EINVAL; return -EINVAL;
prop = of_find_property(np, buf, NULL); return of_remove_property(np, of_find_property(np, buf, NULL));
return of_remove_property(np, prop);
} }
static int do_update_property(char *buf, size_t bufsize) static int do_update_property(char *buf, size_t bufsize)