2016-04-28 12:42:56

by Peter Ujfalusi

[permalink] [raw]

Subject: [PATCH] drm/omap: Remove deprecated regulator_can_change_voltage() usage

---

regulator_can_change_voltage() is deprecated and it's use is not necessary
as commit:
6a0028b3dd67b regulator: Deprecate regulator_can_change_voltage()
describers it clearly.
As there is no practical use of it it can be removed.
At this point the regulator_set_voltage() calls can not be removed as the
DT data need to be fixed first.

Signed-off-by: Peter Ujfalusi <[email protected]>
---
drivers/gpu/drm/omapdrm/dss/dsi.c | 12 +++++-------
drivers/gpu/drm/omapdrm/dss/hdmi4.c | 12 +++++-------
drivers/gpu/drm/omapdrm/dss/hdmi5.c | 12 +++++-------
3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 8730646a0cbb..316cde6a794f 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -1180,13 +1180,11 @@ static int dsi_regulator_init(struct platform_device *dsidev)
return PTR_ERR(vdds_dsi);
}

- if (regulator_can_change_voltage(vdds_dsi)) {
- r = regulator_set_voltage(vdds_dsi, 1800000, 1800000);
- if (r) {
- devm_regulator_put(vdds_dsi);
- DSSERR("can't set the DSI regulator voltage\n");
- return r;
- }
+ r = regulator_set_voltage(vdds_dsi, 1800000, 1800000);
+ if (r) {
+ devm_regulator_put(vdds_dsi);
+ DSSERR("can't set the DSI regulator voltage\n");
+ return r;
}

dsi->vdds_dsi_reg = vdds_dsi;
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index f892ae157ff3..289f87ae9f62 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -114,13 +114,11 @@ static int hdmi_init_regulator(void)
return PTR_ERR(reg);
}

- if (regulator_can_change_voltage(reg)) {
- r = regulator_set_voltage(reg, 1800000, 1800000);
- if (r) {
- devm_regulator_put(reg);
- DSSWARN("can't set the regulator voltage\n");
- return r;
- }
+ r = regulator_set_voltage(reg, 1800000, 1800000);
+ if (r) {
+ devm_regulator_put(reg);
+ DSSWARN("can't set the regulator voltage\n");
+ return r;
}

hdmi.vdda_reg = reg;
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index a43f7b10e113..b6d101076eb4 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -131,13 +131,11 @@ static int hdmi_init_regulator(void)
return PTR_ERR(reg);
}

- if (regulator_can_change_voltage(reg)) {
- r = regulator_set_voltage(reg, 1800000, 1800000);
- if (r) {
- devm_regulator_put(reg);
- DSSWARN("can't set the regulator voltage\n");
- return r;
- }
+ r = regulator_set_voltage(reg, 1800000, 1800000);
+ if (r) {
+ devm_regulator_put(reg);
+ DSSWARN("can't set the regulator voltage\n");
+ return r;
}

hdmi.vdda_reg = reg;
--
2.8.1

2016-04-29 10:52:24

by Tomi Valkeinen

[permalink] [raw]

Subject: Re: [PATCH] drm/omap: Remove deprecated regulator_can_change_voltage() usage

---

On 28/04/16 15:42, Peter Ujfalusi wrote:
> regulator_can_change_voltage() is deprecated and it's use is not necessary
> as commit:
> 6a0028b3dd67b regulator: Deprecate regulator_can_change_voltage()
> describers it clearly.
> As there is no practical use of it it can be removed.
> At this point the regulator_set_voltage() calls can not be removed as the
> DT data need to be fixed first.
>
> Signed-off-by: Peter Ujfalusi <[email protected]>
> ---
> drivers/gpu/drm/omapdrm/dss/dsi.c | 12 +++++-------
> drivers/gpu/drm/omapdrm/dss/hdmi4.c | 12 +++++-------
> drivers/gpu/drm/omapdrm/dss/hdmi5.c | 12 +++++-------
> 3 files changed, 15 insertions(+), 21 deletions(-)

Thanks, queued for 4.7.

Tomi

---

Attachments:

signature.asc (819.00 B)
OpenPGP digital signature