| Message ID | 1471340976-5379-4-git-send-email-jonathanh@nvidia.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 16 August 2016 at 11:49, Jon Hunter <jonathanh@nvidia.com> wrote: > Update the staging/board PM domain code to use the > of_genpd_add_subdomain() and remove any calls to > of_genpd_get_from_provider(). > > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe > --- > drivers/staging/board/board.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/staging/board/board.c b/drivers/staging/board/board.c > index 45807d8287d1..86dc41101610 100644 > --- a/drivers/staging/board/board.c > +++ b/drivers/staging/board/board.c > @@ -140,7 +140,6 @@ static int board_staging_add_dev_domain(struct platform_device *pdev, > const char *domain) > { > struct of_phandle_args pd_args; > - struct generic_pm_domain *pd; > struct device_node *np; > > np = of_find_node_by_path(domain); > @@ -151,14 +150,8 @@ static int board_staging_add_dev_domain(struct platform_device *pdev, > > pd_args.np = np; > pd_args.args_count = 0; > - pd = of_genpd_get_from_provider(&pd_args); > - if (IS_ERR(pd)) { > - pr_err("Cannot find genpd %s (%ld)\n", domain, PTR_ERR(pd)); > - return PTR_ERR(pd); > - } > - pr_debug("Found genpd %s for device %s\n", pd->name, pdev->name); > > - return pm_genpd_add_device(pd, &pdev->dev); > + return of_genpd_add_device(&pd_args, &pdev->dev); > } > #else > static inline int board_staging_add_dev_domain(struct platform_device *pdev, > -- > 2.1.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/board/board.c b/drivers/staging/board/board.c index 45807d8287d1..86dc41101610 100644 --- a/drivers/staging/board/board.c +++ b/drivers/staging/board/board.c @@ -140,7 +140,6 @@ static int board_staging_add_dev_domain(struct platform_device *pdev, const char *domain) { struct of_phandle_args pd_args; - struct generic_pm_domain *pd; struct device_node *np; np = of_find_node_by_path(domain); @@ -151,14 +150,8 @@ static int board_staging_add_dev_domain(struct platform_device *pdev, pd_args.np = np; pd_args.args_count = 0; - pd = of_genpd_get_from_provider(&pd_args); - if (IS_ERR(pd)) { - pr_err("Cannot find genpd %s (%ld)\n", domain, PTR_ERR(pd)); - return PTR_ERR(pd); - } - pr_debug("Found genpd %s for device %s\n", pd->name, pdev->name); - return pm_genpd_add_device(pd, &pdev->dev); + return of_genpd_add_device(&pd_args, &pdev->dev); } #else static inline int board_staging_add_dev_domain(struct platform_device *pdev,
Update the staging/board PM domain code to use the of_genpd_add_subdomain() and remove any calls to of_genpd_get_from_provider(). Signed-off-by: Jon Hunter <jonathanh@nvidia.com> --- drivers/staging/board/board.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)