Merge tag 'devprop-fix-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

torvalds · torvalds · commit 96d0d831a500 · 2017-07-14T22:39:35.000-07:00
Pull device properties framework fix from Rafael Wysocki:
 "This fixes a problem with bool properties that could be seen as "true"
  when the property was not present at all by adding a special helper
  for bool properties with checks for all of the requisute conditions
  (Sakari Ailus)"

* tag 'devprop-fix-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  device property: Introduce fwnode_call_bool_op() for ops that return bool
diff --git a/drivers/base/property.c b/drivers/base/property.c
@@ -253,10 +253,10 @@ bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname)
 {
 	bool ret;
 
-	ret = fwnode_call_int_op(fwnode, property_present, propname);
+	ret = fwnode_call_bool_op(fwnode, property_present, propname);
 	if (ret == false && !IS_ERR_OR_NULL(fwnode) &&
 	    !IS_ERR_OR_NULL(fwnode->secondary))
-		ret = fwnode_call_int_op(fwnode->secondary, property_present,
+		ret = fwnode_call_bool_op(fwnode->secondary, property_present,
 					 propname);
 	return ret;
 }
@@ -1027,7 +1027,7 @@ EXPORT_SYMBOL_GPL(fwnode_handle_put);
  */
 bool fwnode_device_is_available(struct fwnode_handle *fwnode)
 {
-	return fwnode_call_int_op(fwnode, device_is_available);
+	return fwnode_call_bool_op(fwnode, device_is_available);
 }
 EXPORT_SYMBOL_GPL(fwnode_device_is_available);
 
diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h
@@ -99,6 +99,10 @@ struct fwnode_operations {
 	(fwnode ? (fwnode_has_op(fwnode, op) ?				\
 		   (fwnode)->ops->op(fwnode, ## __VA_ARGS__) : -ENXIO) : \
 	 -EINVAL)
+#define fwnode_call_bool_op(fwnode, op, ...)				\
+	(fwnode ? (fwnode_has_op(fwnode, op) ?				\
+		   (fwnode)->ops->op(fwnode, ## __VA_ARGS__) : false) : \
+	 false)
 #define fwnode_call_ptr_op(fwnode, op, ...)		\
 	(fwnode_has_op(fwnode, op) ?			\
 	 (fwnode)->ops->op(fwnode, ## __VA_ARGS__) : NULL)

Original file line number	Diff line number	Diff line change
`@@ -253,10 +253,10 @@ bool fwnode_property_present(struct fwnode_handle fwnode, const char propname)`
`253`	`253`	`{`
`254`	`254`	`bool ret;`
`255`	`255`
`256`		`- ret = fwnode_call_int_op(fwnode, property_present, propname);`
	`256`	`+ ret = fwnode_call_bool_op(fwnode, property_present, propname);`
`257`	`257`	`if (ret == false && !IS_ERR_OR_NULL(fwnode) &&`
`258`	`258`	`!IS_ERR_OR_NULL(fwnode->secondary))`
`259`		`- ret = fwnode_call_int_op(fwnode->secondary, property_present,`
	`259`	`+ ret = fwnode_call_bool_op(fwnode->secondary, property_present,`
`260`	`260`	`propname);`
`261`	`261`	`return ret;`
`262`	`262`	`}`
`@@ -1027,7 +1027,7 @@ EXPORT_SYMBOL_GPL(fwnode_handle_put);`
`1027`	`1027`	`*/`
`1028`	`1028`	`bool fwnode_device_is_available(struct fwnode_handle *fwnode)`
`1029`	`1029`	`{`
`1030`		`- return fwnode_call_int_op(fwnode, device_is_available);`
	`1030`	`+ return fwnode_call_bool_op(fwnode, device_is_available);`
`1031`	`1031`	`}`
`1032`	`1032`	`EXPORT_SYMBOL_GPL(fwnode_device_is_available);`
`1033`	`1033`