Skip to content

Commit

Permalink
driver core: Make parameter check consistent for API cluster device_(…
Browse files Browse the repository at this point in the history
…for_each|find)_child()

The following API cluster takes the same type parameter list, but do not
have consistent parameter check as shown below.

device_for_each_child(struct device *parent, ...)  // check (!parent->p)
device_for_each_child_reverse(struct device *parent, ...) // same as above
device_find_child(struct device *parent, ...)      // check (!parent)

Fixed by using consistent check (!parent || !parent->p) which covers
both existing checks for the cluster.

Signed-off-by: Zijun Hu <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
zijun-hu authored and gregkh committed Sep 3, 2024
1 parent 8ab0f46 commit 903c449
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/base/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3998,7 +3998,7 @@ int device_for_each_child(struct device *parent, void *data,
struct device *child;
int error = 0;

if (!parent->p)
if (!parent || !parent->p)
return 0;

klist_iter_init(&parent->p->klist_children, &i);
Expand Down Expand Up @@ -4028,7 +4028,7 @@ int device_for_each_child_reverse(struct device *parent, void *data,
struct device *child;
int error = 0;

if (!parent->p)
if (!parent || !parent->p)
return 0;

klist_iter_init(&parent->p->klist_children, &i);
Expand Down Expand Up @@ -4062,7 +4062,7 @@ struct device *device_find_child(struct device *parent, void *data,
struct klist_iter i;
struct device *child;

if (!parent)
if (!parent || !parent->p)
return NULL;

klist_iter_init(&parent->p->klist_children, &i);
Expand Down

0 comments on commit 903c449

Please sign in to comment.