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

storulf · rafaeljw · commit 924f44869962 · 2018-05-30T13:51:51.000+02:00
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 &lt;ulf.hansson@linaro.org&gt;
Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
diff --git 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
@@ -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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ static inline struct generic_pm_domain_data dev_gpd_data(struct device dev)`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`int pm_genpd_add_device(struct generic_pm_domain genpd, struct device dev);`
`147`		`-int pm_genpd_remove_device(struct generic_pm_domain genpd, struct device dev);`
	`147`	`+int pm_genpd_remove_device(struct device *dev);`
`148`	`148`	`int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,`
`149`	`149`	`struct generic_pm_domain *new_subdomain);`
`150`	`150`	`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`	`167`	`{`
`168`	`168`	`return -ENOSYS;`
`169`	`169`	`}`
`170`		`-static inline int pm_genpd_remove_device(struct generic_pm_domain *genpd,`
`171`		`- struct device *dev)`
	`170`	`+static inline int pm_genpd_remove_device(struct device *dev)`
`172`	`171`	`{`
`173`	`172`	`return -ENOSYS;`
`174`	`173`	`}`