linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/panfrost: Remove NULL check for regulator
@ 2019-10-04 14:44 Steven Price
  2019-10-09 18:40 ` Rob Herring
  0 siblings, 1 reply; 2+ messages in thread
From: Steven Price @ 2019-10-04 14:44 UTC (permalink / raw)
  To: Daniel Vetter, David Airlie, Rob Herring, Tomeu Vizoso
  Cc: Alyssa Rosenzweig, Steven Price, dri-devel, linux-kernel

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(-)

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;
 	}
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] drm/panfrost: Remove NULL check for regulator
  2019-10-04 14:44 [PATCH] drm/panfrost: Remove NULL check for regulator Steven Price
@ 2019-10-09 18:40 ` Rob Herring
  0 siblings, 0 replies; 2+ messages in thread
From: Rob Herring @ 2019-10-09 18:40 UTC (permalink / raw)
  To: Steven Price
  Cc: Daniel Vetter, David Airlie, Tomeu Vizoso, Alyssa Rosenzweig,
	dri-devel, linux-kernel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-10-09 18:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-04 14:44 [PATCH] drm/panfrost: Remove NULL check for regulator Steven Price
2019-10-09 18:40 ` Rob Herring

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).