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.

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.

 drivers/gpu/drm/panel/panel-simple.c | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/drivers/gpu/drm/panel/panel-simple.c 
b/drivers/gpu/drm/panel/panel-simple.c
index dcb6d0b6ced0..42d902d2bbbe 100644
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -138,9 +138,6 @@ struct panel_desc {
 
 struct panel_simple {
        struct drm_panel base;
-       bool enabled;
-
-       bool prepared;
 
        ktime_t unprepared_time;
 
@@ -290,14 +287,9 @@ static int panel_simple_disable(struct drm_panel *panel)
 {
        struct panel_simple *p = to_panel_simple(panel);
 
-       if (!p->enabled)
-               return 0;
-
        if (p->desc->delay.disable)
                msleep(p->desc->delay.disable);
 
-       p->enabled = false;
-
        return 0;
 }
 
@@ -317,18 +309,12 @@ static int panel_simple_suspend(struct device *dev)
 
 static int panel_simple_unprepare(struct drm_panel *panel)
 {
-       struct panel_simple *p = to_panel_simple(panel);
        int ret;
 
-       /* Unpreparing when already unprepared is a no-op */
-       if (!p->prepared)
-               return 0;
-
        pm_runtime_mark_last_busy(panel->dev);
        ret = pm_runtime_put_autosuspend(panel->dev);
        if (ret < 0)
                return ret;
-       p->prepared = false;
 
        return 0;
 }
@@ -356,21 +342,14 @@ static int panel_simple_resume(struct device *dev)
 
 static int panel_simple_prepare(struct drm_panel *panel)
 {
-       struct panel_simple *p = to_panel_simple(panel);
        int ret;
 
-       /* Preparing when already prepared is a no-op */
-       if (p->prepared)
-               return 0;
-
        ret = pm_runtime_get_sync(panel->dev);
        if (ret < 0) {
                pm_runtime_put_autosuspend(panel->dev);
                return ret;
        }
 
-       p->prepared = true;
-
        return 0;
 }
 
@@ -378,14 +357,9 @@ static int panel_simple_enable(struct drm_panel *panel)
 {
        struct panel_simple *p = to_panel_simple(panel);
 
-       if (p->enabled)
-               return 0;
-
        if (p->desc->delay.enable)
                msleep(p->desc->delay.enable);
 
-       p->enabled = true;
-
        return 0;
 }
 
@@ -609,7 +583,6 @@ static int panel_simple_probe(struct device *dev, const 
struct panel_desc *desc)
        if (!panel)
                return -ENOMEM;
 
-       panel->enabled = false;
        panel->desc = desc;
 
        panel->supply = devm_regulator_get(dev, "power");
-- 
2.45.0.rc1.225.g2a3ae87e7f-goog

Reply via email to