Commit 02bdbf7d authored by Chanwoo Choi's avatar Chanwoo Choi
Browse files

PM / devfreq: event: Change prototype of devfreq_event_get_edev_by_phandle function 



Previously, devfreq core support 'devfreq-events' property in order to get
the devfreq-event device by phandle. But, 'devfreq-events' property name is
not proper on devicetree binding because this name doesn't mean
the any h/w attribute.

The devfreq-event core hand over the rights to decide the property name
for getting the devfreq-event device on devicetree. Each devfreq-event driver
will decide the property name on devicetree binding and then pass
the their own property name to devfreq_event_get_edev_by_phandle function.

And change the prototype of devfreq_event_get_edev_count function
because of used deprecated 'devfreq-events' property.

Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 86d90fd9

drivers/devfreq/devfreq-event.c

+8 −6
Original line number Diff line number Diff line
@@ -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,

drivers/devfreq/exynos-bus.c

+3 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np, 
	 * Get the devfreq-event devices to get the current utilization of

	 * buses. This raw data will be used in devfreq ondemand governor.

	 */

	count = devfreq_event_get_edev_count(dev);

	count = devfreq_event_get_edev_count(dev, "devfreq-events");

	if (count < 0) {

		dev_err(dev, "failed to get the count of devfreq-event dev\n");

		ret = count;
@@ -209,7 +209,8 @@ static int exynos_bus_parent_parse_of(struct device_node *np, 
	}



	for (i = 0; i < count; i++) {

		bus->edev[i] = devfreq_event_get_edev_by_phandle(dev, i);

		bus->edev[i] = devfreq_event_get_edev_by_phandle(dev,

							"devfreq-events", i);

		if (IS_ERR(bus->edev[i])) {

			ret = -EPROBE_DEFER;

			goto err_regulator;

drivers/devfreq/rk3399_dmc.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) 
		return PTR_ERR(data->dmc_clk);

	}



	data->edev = devfreq_event_get_edev_by_phandle(dev, 0);

	data->edev = devfreq_event_get_edev_by_phandle(dev, "devfreq-events", 0);

	if (IS_ERR(data->edev))

		return -EPROBE_DEFER;

drivers/memory/samsung/exynos5422-dmc.c

+4 −2
Original line number Diff line number Diff line
@@ -1293,7 +1293,8 @@ static int exynos5_performance_counters_init(struct exynos5_dmc *dmc) 
	int counters_size;

	int ret, i;



	dmc->num_counters = devfreq_event_get_edev_count(dmc->dev);

	dmc->num_counters = devfreq_event_get_edev_count(dmc->dev,

							"devfreq-events");

	if (dmc->num_counters < 0) {

		dev_err(dmc->dev, "could not get devfreq-event counters\n");

		return dmc->num_counters;
@@ -1306,7 +1307,8 @@ static int exynos5_performance_counters_init(struct exynos5_dmc *dmc) 


	for (i = 0; i < dmc->num_counters; i++) {

		dmc->counter[i] =

			devfreq_event_get_edev_by_phandle(dmc->dev, i);

			devfreq_event_get_edev_by_phandle(dmc->dev,

						"devfreq-events", i);

		if (IS_ERR_OR_NULL(dmc->counter[i]))

			return -EPROBE_DEFER;

	}

include/linux/devfreq-event.h

+10 −4
Original line number Diff line number Diff line
@@ -106,8 +106,11 @@ extern int devfreq_event_get_event(struct devfreq_event_dev *edev, 
				struct devfreq_event_data *edata);

extern int devfreq_event_reset_event(struct devfreq_event_dev *edev);

extern struct devfreq_event_dev *devfreq_event_get_edev_by_phandle(

				struct device *dev, int index);

extern int devfreq_event_get_edev_count(struct device *dev);

				struct device *dev,

				const char *phandle_name,

				int index);

extern int devfreq_event_get_edev_count(struct device *dev,

				const char *phandle_name);

extern struct devfreq_event_dev *devfreq_event_add_edev(struct device *dev,

				struct devfreq_event_desc *desc);

extern int devfreq_event_remove_edev(struct devfreq_event_dev *edev);
@@ -152,12 +155,15 @@ static inline int devfreq_event_reset_event(struct devfreq_event_dev *edev) 
}



static inline struct devfreq_event_dev *devfreq_event_get_edev_by_phandle(

					struct device *dev, int index)

					struct device *dev,

					const char *phandle_name,

					int index)

{

	return ERR_PTR(-EINVAL);

}



static inline int devfreq_event_get_edev_count(struct device *dev)

static inline int devfreq_event_get_edev_count(struct device *dev,

					const char *phandle_name)

{

	return -EINVAL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE