提交 924f4486 编写于 作者: U Ulf Hansson 提交者: Rafael J. Wysocki

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: NUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
上级 1a7a6707
...@@ -1475,13 +1475,13 @@ static int genpd_remove_device(struct generic_pm_domain *genpd, ...@@ -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. * 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. * @dev: Device to be removed.
*/ */
int pm_genpd_remove_device(struct generic_pm_domain *genpd, int pm_genpd_remove_device(struct device *dev)
struct device *dev)
{ {
if (!genpd || genpd != genpd_lookup_dev(dev)) struct generic_pm_domain *genpd = genpd_lookup_dev(dev);
if (!genpd)
return -EINVAL; return -EINVAL;
return genpd_remove_device(genpd, dev); return genpd_remove_device(genpd, dev);
......
...@@ -513,7 +513,7 @@ static int acp_hw_fini(void *handle) ...@@ -513,7 +513,7 @@ static int acp_hw_fini(void *handle)
if (adev->acp.acp_genpd) { if (adev->acp.acp_genpd) {
for (i = 0; i < ACP_DEVS ; i++) { for (i = 0; i < ACP_DEVS ; i++) {
dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, 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 removal fails, dont giveup and try rest */
if (ret) if (ret)
dev_err(dev, "remove dev from genpd failed\n"); dev_err(dev, "remove dev from genpd failed\n");
......
...@@ -144,7 +144,7 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) ...@@ -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_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, int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,
struct generic_pm_domain *new_subdomain); struct generic_pm_domain *new_subdomain);
int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, 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, ...@@ -167,8 +167,7 @@ static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,
{ {
return -ENOSYS; return -ENOSYS;
} }
static inline int pm_genpd_remove_device(struct generic_pm_domain *genpd, static inline int pm_genpd_remove_device(struct device *dev)
struct device *dev)
{ {
return -ENOSYS; return -ENOSYS;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册