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

Commit 263c589b authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM / Domains: Remove legacy API for adding devices through DT 



There are no active clients of the legacy API and we now also have a
better way to handle genpd DT support. So let's remove the legacy API.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d79b6fe1

drivers/base/power/domain.c

+0 −33
Original line number Original line Diff line number Diff line
@@ -1456,39 +1456,6 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, 
	return ret;

	return ret;

}

}





/**

 * __pm_genpd_of_add_device - Add a device to an I/O PM domain.

 * @genpd_node: Device tree node pointer representing a PM domain to which the

 *   the device is added to.

 * @dev: Device to be added.

 * @td: Set of PM QoS timing parameters to attach to the device.

 */

int __pm_genpd_of_add_device(struct device_node *genpd_node, struct device *dev,

			     struct gpd_timing_data *td)

{

	struct generic_pm_domain *genpd = NULL, *gpd;



	dev_dbg(dev, "%s()\n", __func__);



	if (IS_ERR_OR_NULL(genpd_node) || IS_ERR_OR_NULL(dev))

		return -EINVAL;



	mutex_lock(&gpd_list_lock);

	list_for_each_entry(gpd, &gpd_list, gpd_list_node) {

		if (gpd->of_node == genpd_node) {

			genpd = gpd;

			break;

		}

	}

	mutex_unlock(&gpd_list_lock);



	if (!genpd)

		return -EINVAL;



	return __pm_genpd_add_device(genpd, dev, td);

}





/**

/**

 * __pm_genpd_name_add_device - Find I/O PM domain and add a device to it.

 * __pm_genpd_name_add_device - Find I/O PM domain and add a device to it.

 * @domain_name: Name of the PM domain to add the device to.

 * @domain_name: Name of the PM domain to add the device to.

include/linux/pm_domain.h

+0 −17
Original line number Original line Diff line number Diff line
@@ -71,7 +71,6 @@ struct generic_pm_domain { 
	s64 max_off_time_ns;	/* Maximum allowed "suspended" time. */

	s64 max_off_time_ns;	/* Maximum allowed "suspended" time. */

	bool max_off_time_changed;

	bool max_off_time_changed;

	bool cached_power_down_ok;

	bool cached_power_down_ok;

	struct device_node *of_node; /* Node in device tree */

	struct gpd_cpu_data *cpu_data;

	struct gpd_cpu_data *cpu_data;

	void (*attach_dev)(struct device *dev);

	void (*attach_dev)(struct device *dev);

	void (*detach_dev)(struct device *dev);

	void (*detach_dev)(struct device *dev);
@@ -124,10 +123,6 @@ extern int __pm_genpd_add_device(struct generic_pm_domain *genpd, 
				 struct device *dev,

				 struct device *dev,

				 struct gpd_timing_data *td);

				 struct gpd_timing_data *td);





extern int __pm_genpd_of_add_device(struct device_node *genpd_node,

				    struct device *dev,

				    struct gpd_timing_data *td);



extern int __pm_genpd_name_add_device(const char *domain_name,

extern int __pm_genpd_name_add_device(const char *domain_name,

				      struct device *dev,

				      struct device *dev,

				      struct gpd_timing_data *td);

				      struct gpd_timing_data *td);
@@ -169,12 +164,6 @@ static inline int __pm_genpd_add_device(struct generic_pm_domain *genpd, 
{

{

	return -ENOSYS;

	return -ENOSYS;

}

}

static inline int __pm_genpd_of_add_device(struct device_node *genpd_node,

					   struct device *dev,

					   struct gpd_timing_data *td)

{

	return -ENOSYS;

}

static inline int __pm_genpd_name_add_device(const char *domain_name,

static inline int __pm_genpd_name_add_device(const char *domain_name,

					     struct device *dev,

					     struct device *dev,

					     struct gpd_timing_data *td)

					     struct gpd_timing_data *td)
@@ -240,12 +229,6 @@ static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, 
	return __pm_genpd_add_device(genpd, dev, NULL);

	return __pm_genpd_add_device(genpd, dev, NULL);

}

}





static inline int pm_genpd_of_add_device(struct device_node *genpd_node,

					 struct device *dev)

{

	return __pm_genpd_of_add_device(genpd_node, dev, NULL);

}



static inline int pm_genpd_name_add_device(const char *domain_name,

static inline int pm_genpd_name_add_device(const char *domain_name,

					   struct device *dev)

					   struct device *dev)

{

{