| Message ID | 20200919100850.1639111-1-liushixin2@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] drm/lima: simplify the return expression of lima_devfreq_target | expand |
Applied to drm-misc-next. On Sat, Sep 19, 2020 at 6:43 PM Qiang Yu <yuq825@gmail.com> wrote: > > Looks good for me, patch is: > Reviewed-by: Qiang Yu <yuq825@gmail.com> > > Regards, > Qiang > > On Sat, Sep 19, 2020 at 5:47 PM Liu Shixin <liushixin2@huawei.com> wrote: > > > > Simplify the return expression. > > > > Signed-off-by: Liu Shixin <liushixin2@huawei.com> > > --- > > drivers/gpu/drm/lima/lima_devfreq.c | 7 +------ > > 1 file changed, 1 insertion(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c > > index bbe02817721b..5914442936ed 100644 > > --- 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) > > -- > > 2.25.1 > >
diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c index bbe02817721b..5914442936ed 100644 --- 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)
Simplify the return expression. Signed-off-by: Liu Shixin <liushixin2@huawei.com> --- drivers/gpu/drm/lima/lima_devfreq.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)