Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96d0d831 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 1ef27400 e8158b48

drivers/base/property.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

include/linux/fwnode.h

+4 −0
Original line number Diff line number Diff line
@@ -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)