As talked about in commit d2aacaf07395 ("drm/panel: Check for already
prepared/enabled in drm_panel"), we want to remove needless code from
panel drivers that was storing and double-checking the
prepared/enabled state. Even if someone was relying on the
double-check before, that double-check is now in the core and not
needed in individual drivers.

Cc: Peter Ujfalusi <peter.ujfal...@ti.com>
Signed-off-by: Douglas Anderson <diand...@chromium.org>
---

Changes in v2:
- Only handle 1 panel per patch.
- Split removal of prepared/enabled from handling of remove/shutdown.

 .../drm/panel/panel-osd-osd101t2587-53ts.c    | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c 
b/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
index 493e0504f6f7..c0da7d9512e8 100644
--- a/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
+++ b/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
@@ -21,9 +21,6 @@ struct osd101t2587_panel {
 
        struct regulator *supply;
 
-       bool prepared;
-       bool enabled;
-
        const struct drm_display_mode *default_mode;
 };
 
@@ -37,13 +34,8 @@ static int osd101t2587_panel_disable(struct drm_panel *panel)
        struct osd101t2587_panel *osd101t2587 = ti_osd_panel(panel);
        int ret;
 
-       if (!osd101t2587->enabled)
-               return 0;
-
        ret = mipi_dsi_shutdown_peripheral(osd101t2587->dsi);
 
-       osd101t2587->enabled = false;
-
        return ret;
 }
 
@@ -51,11 +43,7 @@ static int osd101t2587_panel_unprepare(struct drm_panel 
*panel)
 {
        struct osd101t2587_panel *osd101t2587 = ti_osd_panel(panel);
 
-       if (!osd101t2587->prepared)
-               return 0;
-
        regulator_disable(osd101t2587->supply);
-       osd101t2587->prepared = false;
 
        return 0;
 }
@@ -63,16 +51,8 @@ static int osd101t2587_panel_unprepare(struct drm_panel 
*panel)
 static int osd101t2587_panel_prepare(struct drm_panel *panel)
 {
        struct osd101t2587_panel *osd101t2587 = ti_osd_panel(panel);
-       int ret;
 
-       if (osd101t2587->prepared)
-               return 0;
-
-       ret = regulator_enable(osd101t2587->supply);
-       if (!ret)
-               osd101t2587->prepared = true;
-
-       return ret;
+       return regulator_enable(osd101t2587->supply);
 }
 
 static int osd101t2587_panel_enable(struct drm_panel *panel)
@@ -80,15 +60,10 @@ static int osd101t2587_panel_enable(struct drm_panel *panel)
        struct osd101t2587_panel *osd101t2587 = ti_osd_panel(panel);
        int ret;
 
-       if (osd101t2587->enabled)
-               return 0;
-
        ret = mipi_dsi_turn_on_peripheral(osd101t2587->dsi);
        if (ret)
                return ret;
 
-       osd101t2587->enabled = true;
-
        return ret;
 }
 
-- 
2.45.0.rc1.225.g2a3ae87e7f-goog

Reply via email to