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

Commit 1a7a6707 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM / Domains: Drop __pm_genpd_add_device() 



There are still a few non-DT existing users of genpd, however neither of
them uses __pm_genpd_add_device(), hence let's drop it.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 781b9d6b

drivers/base/power/domain.c

+4 −6
Original line number Diff line number Diff line
@@ -1414,23 +1414,21 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, 
}



/**

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

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

 * @genpd: PM domain to add the device to.

 * @dev: Device to be added.

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

 */

int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,

			  struct gpd_timing_data *td)

int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev)

{

	int ret;



	mutex_lock(&gpd_list_lock);

	ret = genpd_add_device(genpd, dev, td);

	ret = genpd_add_device(genpd, dev, NULL);

	mutex_unlock(&gpd_list_lock);



	return ret;

}

EXPORT_SYMBOL_GPL(__pm_genpd_add_device);

EXPORT_SYMBOL_GPL(pm_genpd_add_device);



static int genpd_remove_device(struct generic_pm_domain *genpd,

			       struct device *dev)

include/linux/pm_domain.h

+3 −11
Original line number Diff line number Diff line
@@ -143,8 +143,7 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) 
	return to_gpd_data(dev->power.subsys_data->domain_data);

}



int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,

			  struct gpd_timing_data *td);

int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev);

int pm_genpd_remove_device(struct generic_pm_domain *genpd, struct device *dev);

int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,

			   struct generic_pm_domain *new_subdomain);
@@ -163,9 +162,8 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) 
{

	return ERR_PTR(-ENOSYS);

}

static inline int __pm_genpd_add_device(struct generic_pm_domain *genpd,

					struct device *dev,

					struct gpd_timing_data *td)

static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,

				      struct device *dev)

{

	return -ENOSYS;

}
@@ -204,12 +202,6 @@ static inline int dev_pm_genpd_set_performance_state(struct device *dev, 
#define pm_domain_always_on_gov		(*(struct dev_power_governor *)(NULL))

#endif



static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,

				      struct device *dev)

{

	return __pm_genpd_add_device(genpd, dev, NULL);

}



#ifdef CONFIG_PM_GENERIC_DOMAINS_SLEEP

void pm_genpd_syscore_poweroff(struct device *dev);

void pm_genpd_syscore_poweron(struct device *dev);