device property: Introduce fwnode_call_bool_op() for ops that return bool

Sakari Ailus · rafaeljw · commit e8158b486d5f · 2017-07-12T13:32:46.000+02:00
fwnode_call_int_op() isn't suitable for calling ops that return bool since it effectively causes the result returned to the user to be true when an op hasn't been defined or the fwnode is NULL. Address this by introducing fwnode_call_bool_op() for calling ops that return bool. Fixes: 3708184 "device property: Move FW type specific functionality to FW specific files" Fixes: 2294b3a "device property: Introduce fwnode_device_is_available()" Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
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`