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

Commit 924f4486 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM / Domains: Drop genpd as in-param for pm_genpd_remove_device() 



There is no need to pass a genpd struct to pm_genpd_remove_device(), as we
already have the information about the PM domain (genpd) through the device
structure.

Additionally, we don't allow to remove a PM domain from a device, other
than the one it may have assigned to it, so really it does not make sense
to have a separate in-param for it.

For these reason, drop it and update the current only call to
pm_genpd_remove_device() from amdgpu_acp.

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

drivers/base/power/domain.c

+4 −4
Original line number Diff line number Diff line
@@ -1475,13 +1475,13 @@ static int genpd_remove_device(struct generic_pm_domain *genpd, 


/**

 * pm_genpd_remove_device - Remove a device from an I/O PM domain.

 * @genpd: PM domain to remove the device from.

 * @dev: Device to be removed.

 */

int pm_genpd_remove_device(struct generic_pm_domain *genpd,

			   struct device *dev)

int pm_genpd_remove_device(struct device *dev)

{

	if (!genpd || genpd != genpd_lookup_dev(dev))

	struct generic_pm_domain *genpd = genpd_lookup_dev(dev);



	if (!genpd)

		return -EINVAL;



	return genpd_remove_device(genpd, dev);

drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ static int acp_hw_fini(void *handle) 
	if (adev->acp.acp_genpd) {

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

			dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i);

			ret = pm_genpd_remove_device(&adev->acp.acp_genpd->gpd, dev);

			ret = pm_genpd_remove_device(dev);

			/* If removal fails, dont giveup and try rest */

			if (ret)

				dev_err(dev, "remove dev from genpd failed\n");

include/linux/pm_domain.h

+2 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) 
}



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_remove_device(struct device *dev);

int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,

			   struct generic_pm_domain *new_subdomain);

int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
@@ -167,8 +167,7 @@ static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, 
{

	return -ENOSYS;

}

static inline int pm_genpd_remove_device(struct generic_pm_domain *genpd,

					 struct device *dev)

static inline int pm_genpd_remove_device(struct device *dev)

{

	return -ENOSYS;

}