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

Commit b0e413dd authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Will McVicker
Browse files

UPSTREAM: device property: Add helpers to count items in an array 



The usual pattern to allocate the necessary space for an array of properties is
to count them first by calling:

  count = device_property_read_uXX_array(dev, propname, NULL, 0);
  if (count < 0)
	return count;

Introduce helpers device_property_count_uXX() to count items by supplying hard
coded last two parameters to device_property_readXX_array().

Bug: 150877929
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarWill McVicker <willmcvicker@google.com>
Change-Id: If7cdedae76d0543997b96b3da3d28f6657472d29
(cherry picked from commit 33ee09cd59ce154b64f9df942dfa5456db90d5f9)
parent 55c129b8

include/linux/property.h

+44 −0
Original line number Diff line number Diff line
@@ -143,6 +143,26 @@ static inline int device_property_read_u64(struct device *dev, 
	return device_property_read_u64_array(dev, propname, val, 1);

}



static inline int device_property_count_u8(struct device *dev, const char *propname)

{

	return device_property_read_u8_array(dev, propname, NULL, 0);

}



static inline int device_property_count_u16(struct device *dev, const char *propname)

{

	return device_property_read_u16_array(dev, propname, NULL, 0);

}



static inline int device_property_count_u32(struct device *dev, const char *propname)

{

	return device_property_read_u32_array(dev, propname, NULL, 0);

}



static inline int device_property_count_u64(struct device *dev, const char *propname)

{

	return device_property_read_u64_array(dev, propname, NULL, 0);

}



static inline bool fwnode_property_read_bool(const struct fwnode_handle *fwnode,

					     const char *propname)

{
@@ -173,6 +193,30 @@ static inline int fwnode_property_read_u64(const struct fwnode_handle *fwnode, 
	return fwnode_property_read_u64_array(fwnode, propname, val, 1);

}



static inline int fwnode_property_count_u8(const struct fwnode_handle *fwnode,

					   const char *propname)

{

	return fwnode_property_read_u8_array(fwnode, propname, NULL, 0);

}



static inline int fwnode_property_count_u16(const struct fwnode_handle *fwnode,

					    const char *propname)

{

	return fwnode_property_read_u16_array(fwnode, propname, NULL, 0);

}



static inline int fwnode_property_count_u32(const struct fwnode_handle *fwnode,

					    const char *propname)

{

	return fwnode_property_read_u32_array(fwnode, propname, NULL, 0);

}



static inline int fwnode_property_count_u64(const struct fwnode_handle *fwnode,

					    const char *propname)

{

	return fwnode_property_read_u64_array(fwnode, propname, NULL, 0);

}



/**

 * struct property_entry - "Built-in" device property representation.

 * @name: Name of the property.