diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2016-04-28 08:56:23 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-04-29 06:52:55 -0400 |
| commit | 9b4639bb6a637770fec6b95bb5d9f751e403e8cb (patch) | |
| tree | e76628ff9fc45c860db68015ed897cc22a2868d0 /drivers/video/fbdev/omap2 | |
| parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) | |
video: fbdev: omap2: 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 <peter.ujfalusi@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/fbdev/omap2')
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 12 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 12 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 12 |
3 files changed, 15 insertions, 21 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c index 0eec073b3919..d63e59807707 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c | |||
| @@ -1180,13 +1180,11 @@ static int dsi_regulator_init(struct platform_device *dsidev) | |||
| 1180 | return PTR_ERR(vdds_dsi); | 1180 | return PTR_ERR(vdds_dsi); |
| 1181 | } | 1181 | } |
| 1182 | 1182 | ||
| 1183 | if (regulator_can_change_voltage(vdds_dsi)) { | 1183 | r = regulator_set_voltage(vdds_dsi, 1800000, 1800000); |
| 1184 | r = regulator_set_voltage(vdds_dsi, 1800000, 1800000); | 1184 | if (r) { |
| 1185 | if (r) { | 1185 | devm_regulator_put(vdds_dsi); |
| 1186 | devm_regulator_put(vdds_dsi); | 1186 | DSSERR("can't set the DSI regulator voltage\n"); |
| 1187 | DSSERR("can't set the DSI regulator voltage\n"); | 1187 | return r; |
| 1188 | return r; | ||
| 1189 | } | ||
| 1190 | } | 1188 | } |
| 1191 | 1189 | ||
| 1192 | dsi->vdds_dsi_reg = vdds_dsi; | 1190 | dsi->vdds_dsi_reg = vdds_dsi; |
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c index 7103c659a534..2e71aec838b1 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | |||
| @@ -114,13 +114,11 @@ static int hdmi_init_regulator(void) | |||
| 114 | return PTR_ERR(reg); | 114 | return PTR_ERR(reg); |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | if (regulator_can_change_voltage(reg)) { | 117 | r = regulator_set_voltage(reg, 1800000, 1800000); |
| 118 | r = regulator_set_voltage(reg, 1800000, 1800000); | 118 | if (r) { |
| 119 | if (r) { | 119 | devm_regulator_put(reg); |
| 120 | devm_regulator_put(reg); | 120 | DSSWARN("can't set the regulator voltage\n"); |
| 121 | DSSWARN("can't set the regulator voltage\n"); | 121 | return r; |
| 122 | return r; | ||
| 123 | } | ||
| 124 | } | 122 | } |
| 125 | 123 | ||
| 126 | hdmi.vdda_reg = reg; | 124 | hdmi.vdda_reg = reg; |
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c index a955a2c4c061..aade6d99662a 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | |||
| @@ -131,13 +131,11 @@ static int hdmi_init_regulator(void) | |||
| 131 | return PTR_ERR(reg); | 131 | return PTR_ERR(reg); |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | if (regulator_can_change_voltage(reg)) { | 134 | r = regulator_set_voltage(reg, 1800000, 1800000); |
| 135 | r = regulator_set_voltage(reg, 1800000, 1800000); | 135 | if (r) { |
| 136 | if (r) { | 136 | devm_regulator_put(reg); |
| 137 | devm_regulator_put(reg); | 137 | DSSWARN("can't set the regulator voltage\n"); |
| 138 | DSSWARN("can't set the regulator voltage\n"); | 138 | return r; |
| 139 | return r; | ||
| 140 | } | ||
| 141 | } | 139 | } |
| 142 | 140 | ||
| 143 | hdmi.vdda_reg = reg; | 141 | hdmi.vdda_reg = reg; |
