drm/lima: Fix regulator_get_optional() misuse

Message ID 20190904123129.23351-1-broonie@kernel.org
State New
Headers show
Series
  • drm/lima: Fix regulator_get_optional() misuse
Related show

Commit Message

Mark Brown Sept. 4, 2019, 12:31 p.m.
The lima driver requests a supply using regulator_get_optional() but
both the name of the supply and the usage pattern suggest that it is
being used for the main power for the device and is not at all optional
for the device for function, there is no meaningful handling for absent
supplies.  Such regulators should use the vanilla regulator_get()
interface, it will ensure that even if a supply is not described in the
system integration one will be provided in software.

Signed-off-by: Mark Brown <broonie@kernel.org>

---
 drivers/gpu/drm/lima/lima_device.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

-- 
2.20.1

Patch

diff --git a/drivers/gpu/drm/lima/lima_device.c b/drivers/gpu/drm/lima/lima_device.c
index d86b8d81a483..d718ac70df1e 100644
--- a/drivers/gpu/drm/lima/lima_device.c
+++ b/drivers/gpu/drm/lima/lima_device.c
@@ -142,12 +142,9 @@  static int lima_regulator_init(struct lima_device *dev)
 {
 	int ret;
 
-	dev->regulator = devm_regulator_get_optional(dev->dev, "mali");
+	dev->regulator = devm_regulator_get(dev->dev, "mali");
 	if (IS_ERR(dev->regulator)) {
 		ret = PTR_ERR(dev->regulator);
-		dev->regulator = NULL;
-		if (ret == -ENODEV)
-			return 0;
 		if (ret != -EPROBE_DEFER)
 			dev_err(dev->dev, "failed to get regulator: %d\n", ret);
 		return ret;
@@ -164,8 +161,7 @@  static int lima_regulator_init(struct lima_device *dev)
 
 static void lima_regulator_fini(struct lima_device *dev)
 {
-	if (dev->regulator)
-		regulator_disable(dev->regulator);
+	regulator_disable(dev->regulator);
 }
 
 static int lima_init_ip(struct lima_device *dev, int index)