diff options
Diffstat (limited to 'drivers/devfreq/devfreq-event.c')
| -rw-r--r-- | drivers/devfreq/devfreq-event.c | 14 | 
1 files changed, 8 insertions, 6 deletions
| diff --git a/drivers/devfreq/devfreq-event.c b/drivers/devfreq/devfreq-event.c index 56efbeb7851e..6765c03334bc 100644 --- a/drivers/devfreq/devfreq-event.c +++ b/drivers/devfreq/devfreq-event.c @@ -213,20 +213,21 @@ EXPORT_SYMBOL_GPL(devfreq_event_reset_event);   * devfreq_event_get_edev_by_phandle() - Get the devfreq-event dev from   *					 devicetree.   * @dev		: the pointer to the given device + * @phandle_name: name of property holding a phandle value   * @index	: the index into list of devfreq-event device   *   * Note that this function return the pointer of devfreq-event device.   */  struct devfreq_event_dev *devfreq_event_get_edev_by_phandle(struct device *dev, -						      int index) +					const char *phandle_name, int index)  {  	struct device_node *node;  	struct devfreq_event_dev *edev; -	if (!dev->of_node) +	if (!dev->of_node || !phandle_name)  		return ERR_PTR(-EINVAL); -	node = of_parse_phandle(dev->of_node, "devfreq-events", index); +	node = of_parse_phandle(dev->of_node, phandle_name, index);  	if (!node)  		return ERR_PTR(-ENODEV); @@ -258,19 +259,20 @@ EXPORT_SYMBOL_GPL(devfreq_event_get_edev_by_phandle);  /**   * devfreq_event_get_edev_count() - Get the count of devfreq-event dev   * @dev		: the pointer to the given device + * @phandle_name: name of property holding a phandle value   *   * Note that this function return the count of devfreq-event devices.   */ -int devfreq_event_get_edev_count(struct device *dev) +int devfreq_event_get_edev_count(struct device *dev, const char *phandle_name)  {  	int count; -	if (!dev->of_node) { +	if (!dev->of_node || !phandle_name) {  		dev_err(dev, "device does not have a device node entry\n");  		return -EINVAL;  	} -	count = of_property_count_elems_of_size(dev->of_node, "devfreq-events", +	count = of_property_count_elems_of_size(dev->of_node, phandle_name,  						sizeof(u32));  	if (count < 0) {  		dev_err(dev, |