summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-22 12:08:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-22 12:08:52 -0700
commite42091739f649b3caf43ddffa53f0416dc396fdd (patch)
tree131588a7ff8839b090cb1002366d5ea4edf50300
parent2c1ada4f052d6d5e5c0bf7901617479b2146139e (diff)
parent0e3edd94448001a33ed7f8af2179cd4a280348a2 (diff)
downloadlwn-e42091739f649b3caf43ddffa53f0416dc396fdd.tar.gz
lwn-e42091739f649b3caf43ddffa53f0416dc396fdd.zip
Merge tag 'devprop-5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull device properties framework fix from Rafael Wysocki: "Add missing 'static' in two places (YueHaibing)" * tag 'devprop-5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: drivers: base: swnode: Make two functions static
-rw-r--r--drivers/base/swnode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index 1fad9291f6aa..7fc5a18e02ad 100644
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -472,7 +472,7 @@ static int software_node_read_string_array(const struct fwnode_handle *fwnode,
val, nval);
}
-struct fwnode_handle *
+static struct fwnode_handle *
software_node_get_parent(const struct fwnode_handle *fwnode)
{
struct software_node *swnode = to_software_node(fwnode);
@@ -481,7 +481,7 @@ software_node_get_parent(const struct fwnode_handle *fwnode)
NULL;
}
-struct fwnode_handle *
+static struct fwnode_handle *
software_node_get_next_child(const struct fwnode_handle *fwnode,
struct fwnode_handle *child)
{