Skip to content

Commit 67149a4

Browse files
committed
drm/imx: imx-tve: remove redundant enable tracking
The DRM core already takes care that encoder enable and disable calls are balanced. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
1 parent 07f2c94 commit 67149a4

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

drivers/gpu/drm/imx/imx-tve.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ struct imx_tve {
103103
struct drm_connector connector;
104104
struct drm_encoder encoder;
105105
struct device *dev;
106-
bool enabled;
107106
int mode;
108107
int di_hsync_pin;
109108
int di_vsync_pin;
@@ -129,12 +128,8 @@ static inline struct imx_tve *enc_to_tve(struct drm_encoder *e)
129128

130129
static void tve_enable(struct imx_tve *tve)
131130
{
132-
if (!tve->enabled) {
133-
tve->enabled = true;
134-
clk_prepare_enable(tve->clk);
135-
regmap_update_bits(tve->regmap, TVE_COM_CONF_REG,
136-
TVE_EN, TVE_EN);
137-
}
131+
clk_prepare_enable(tve->clk);
132+
regmap_update_bits(tve->regmap, TVE_COM_CONF_REG, TVE_EN, TVE_EN);
138133

139134
/* clear interrupt status register */
140135
regmap_write(tve->regmap, TVE_STAT_REG, 0xffffffff);
@@ -151,11 +146,8 @@ static void tve_enable(struct imx_tve *tve)
151146

152147
static void tve_disable(struct imx_tve *tve)
153148
{
154-
if (tve->enabled) {
155-
tve->enabled = false;
156-
regmap_update_bits(tve->regmap, TVE_COM_CONF_REG, TVE_EN, 0);
157-
clk_disable_unprepare(tve->clk);
158-
}
149+
regmap_update_bits(tve->regmap, TVE_COM_CONF_REG, TVE_EN, 0);
150+
clk_disable_unprepare(tve->clk);
159151
}
160152

161153
static int tve_setup_tvout(struct imx_tve *tve)

0 commit comments

Comments
 (0)