drm/panfrost: Remove NULL check for regulator
Subsystems (3)
Steven Price
maintainerPATCH 1/1 drm/panfrost: Remove NULL check for regulator
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().
---
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(-)
drivers/gpu/drm/panfrost/panfrost_devfreq.c +2 -4
@@ -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; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 6 lines · Steven Price
devm_regulator_get()is used to populatepfdev->regulatorwhich ensures that this cannot be NULL (a dummy regulator will be returned if necessary). So remove the check inpanfrost_devfreq_target().Signed-off-by Steven Price <[email protected]>
Quoted 8 lines
---
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" (commitsc90f30812a79and52282163dfa6).--- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
Applied, thanks.
Rob