| Message ID | 20191004144413.42586-1-steven.price@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/panfrost: Remove NULL check for regulator | expand |
On Fri, Oct 4, 2019 at 9:44 AM Steven Price <steven.price@arm.com> wrote: > > devm_regulator_get() is used to populate pfdev->regulator which ensures > that this cannot be NULL (a dummy regulator will be returned if > necessary). So remove the check in panfrost_devfreq_target(). > > Signed-off-by: Steven Price <steven.price@arm.com> > --- > This looks like it was accidentally reintroduced by the merge from > drm-next into drm-misc-next due to the duplication of "drm/panfrost: Add > missing check for pfdev-regulator" (commits c90f30812a79 and > 52282163dfa6). > --- > drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Applied, thanks. Rob
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c index c1eb8cfe6aeb..12ff77dacc95 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -53,10 +53,8 @@ static int panfrost_devfreq_target(struct device *dev, unsigned long *freq, if (err) { dev_err(dev, "Cannot set frequency %lu (%d)\n", target_rate, err); - if (pfdev->regulator) - regulator_set_voltage(pfdev->regulator, - pfdev->devfreq.cur_volt, - pfdev->devfreq.cur_volt); + regulator_set_voltage(pfdev->regulator, pfdev->devfreq.cur_volt, + pfdev->devfreq.cur_volt); return err; }
devm_regulator_get() is used to populate pfdev->regulator which ensures that this cannot be NULL (a dummy regulator will be returned if necessary). So remove the check in panfrost_devfreq_target(). Signed-off-by: Steven Price <steven.price@arm.com> --- This looks like it was accidentally reintroduced by the merge from drm-next into drm-misc-next due to the duplication of "drm/panfrost: Add missing check for pfdev-regulator" (commits c90f30812a79 and 52282163dfa6). --- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)