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: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 2bb67e4f62801e3bb967b4652e5a4afde8202b05..83ce6ca6c769109a8fb4546ba23ba95bb071fdbe 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -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);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
index a29362f9ef415d48a6a00ea94d0a6a8fa2b1d7b5..12558044acd46fe493259a88fbf93cac547f291c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
@@ -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");

diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index 79888fb4a81f5799f57748a61fa4da4d2a80c39c..42e0d649e6531577a841cbb7d4b16842a6f413e4 100644 (file)
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -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;
 }