Merge tag 'devprop-5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

torvalds · torvalds · commit e42091739f64 · 2019-03-22T12:08:52.000-07:00
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
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ static int software_node_read_string_array(const struct fwnode_handle *fwnode,`
`472`	`472`	`val, nval);`
`473`	`473`	`}`
`474`	`474`
`475`		`-struct fwnode_handle *`
	`475`	`+static struct fwnode_handle *`
`476`	`476`	`software_node_get_parent(const struct fwnode_handle *fwnode)`
`477`	`477`	`{`
`478`	`478`	`struct software_node *swnode = to_software_node(fwnode);`
`@@ -481,7 +481,7 @@ software_node_get_parent(const struct fwnode_handle *fwnode)`
`481`	`481`	`NULL;`
`482`	`482`	`}`
`483`	`483`
`484`		`-struct fwnode_handle *`
	`484`	`+static struct fwnode_handle *`
`485`	`485`	`software_node_get_next_child(const struct fwnode_handle *fwnode,`
`486`	`486`	`struct fwnode_handle *child)`
`487`	`487`	`{`