Merge tag 'x86_microcode_update_for_v5.11' of git://git.kernel.org/pub/scm/linux...

[J-linux.git] / drivers / gpu / drm / lima / lima_devfreq.c

diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c
index bbe02817721bcfe14ac9dc337e5adbf1de0ce608..da7099d20bd5c11d307aacad390e14ac5aa29a38 100644 (file)
--- a/drivers/gpu/drm/lima/lima_devfreq.c
+++ b/drivers/gpu/drm/lima/lima_devfreq.c
@@ -35,18 +35,13 @@ static int lima_devfreq_target(struct device *dev, unsigned long *freq,
                               u32 flags)
 {
        struct dev_pm_opp *opp;
-       int err;
 
        opp = devfreq_recommended_opp(dev, freq, flags);
        if (IS_ERR(opp))
                return PTR_ERR(opp);
        dev_pm_opp_put(opp);
 
-       err = dev_pm_opp_set_rate(dev, *freq);
-       if (err)
-               return err;
-
-       return 0;
+       return dev_pm_opp_set_rate(dev, *freq);
 }
 
 static void lima_devfreq_reset(struct lima_devfreq *devfreq)
@@ -105,10 +100,7 @@ void lima_devfreq_fini(struct lima_device *ldev)
                devfreq->devfreq = NULL;
        }
 
-       if (devfreq->opp_of_table_added) {
-               dev_pm_opp_of_remove_table(ldev->dev);
-               devfreq->opp_of_table_added = false;
-       }
+       dev_pm_opp_of_remove_table(ldev->dev);
 
        if (devfreq->regulators_opp_table) {
                dev_pm_opp_put_regulators(devfreq->regulators_opp_table);
@@ -162,7 +154,6 @@ int lima_devfreq_init(struct lima_device *ldev)
        ret = dev_pm_opp_of_add_table(dev);
        if (ret)
                goto err_fini;
-       ldevfreq->opp_of_table_added = true;
 
        lima_devfreq_reset(ldevfreq);