| Message ID | 20210103035605.23973-1-tiny.windzz@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On Sun, Jan 3, 2021 at 12:58 PM Yangtao Li <tiny.windzz@gmail.com> wrote: > > Use devm_pm_opp_* API to simplify code. > > Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> > --- > drivers/devfreq/imx-bus.c | 14 +++----------- > 1 file changed, 3 insertions(+), 11 deletions(-) > > diff --git a/drivers/devfreq/imx-bus.c b/drivers/devfreq/imx-bus.c > index 4f38455ad742..ff26ef049b1b 100644 > --- a/drivers/devfreq/imx-bus.c > +++ b/drivers/devfreq/imx-bus.c > @@ -61,7 +61,6 @@ static void imx_bus_exit(struct device *dev) > { > struct imx_bus *priv = dev_get_drvdata(dev); > > - dev_pm_opp_of_remove_table(dev); > platform_device_unregister(priv->icc_pdev); > } > > @@ -123,7 +122,7 @@ static int imx_bus_probe(struct platform_device *pdev) > } > platform_set_drvdata(pdev, priv); > > - ret = dev_pm_opp_of_add_table(dev); > + ret = devm_pm_opp_of_add_table(dev); > if (ret < 0) { > dev_err(dev, "failed to get OPP table\n"); > return ret; > @@ -141,18 +140,11 @@ static int imx_bus_probe(struct platform_device *pdev) > if (IS_ERR(priv->devfreq)) { > ret = PTR_ERR(priv->devfreq); > dev_err(dev, "failed to add devfreq device: %d\n", ret); > - goto err; > + return ret; > } > > - ret = imx_bus_init_icc(dev); > - if (ret) > - goto err; > - > - return 0; > + return imx_bus_init_icc(dev); Remove the unneeded blank line under '.return imx_bus_init_icc(dev);". > -err: > - dev_pm_opp_of_remove_table(dev); > - return ret; > } > > static const struct of_device_id imx_bus_of_match[] = { > -- > 2.25.1 >
diff --git a/drivers/devfreq/imx-bus.c b/drivers/devfreq/imx-bus.c index 4f38455ad742..ff26ef049b1b 100644 --- a/drivers/devfreq/imx-bus.c +++ b/drivers/devfreq/imx-bus.c @@ -61,7 +61,6 @@ static void imx_bus_exit(struct device *dev) { struct imx_bus *priv = dev_get_drvdata(dev); - dev_pm_opp_of_remove_table(dev); platform_device_unregister(priv->icc_pdev); } @@ -123,7 +122,7 @@ static int imx_bus_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, priv); - ret = dev_pm_opp_of_add_table(dev); + ret = devm_pm_opp_of_add_table(dev); if (ret < 0) { dev_err(dev, "failed to get OPP table\n"); return ret; @@ -141,18 +140,11 @@ static int imx_bus_probe(struct platform_device *pdev) if (IS_ERR(priv->devfreq)) { ret = PTR_ERR(priv->devfreq); dev_err(dev, "failed to add devfreq device: %d\n", ret); - goto err; + return ret; } - ret = imx_bus_init_icc(dev); - if (ret) - goto err; - - return 0; + return imx_bus_init_icc(dev); -err: - dev_pm_opp_of_remove_table(dev); - return ret; } static const struct of_device_id imx_bus_of_match[] = {
Use devm_pm_opp_* API to simplify code. Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> --- drivers/devfreq/imx-bus.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)