drm/panel: innolux-p079zca: Stop tracking prepared/enabled
authorDouglas Anderson <dianders@chromium.org>
Fri, 3 May 2024 21:32:49 +0000 (14:32 -0700)
committerDouglas Anderson <dianders@chromium.org>
Tue, 28 May 2024 20:09:10 +0000 (13:09 -0700)
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: Chris Zhong <zyw@rock-chips.com>
Cc: Lin Huang <hl@rock-chips.com>
Cc: Brian Norris <briannorris@chromium.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240503143327.RFT.v2.8.I99c73621fe3fba067a5e7ee6a1f6293c23371e1e@changeid
drivers/gpu/drm/panel/panel-innolux-p079zca.c

index 0691a27a0daa6065cf000ddbc58ae1a1e7affffc..fe83e5e218df702e26238fb2eac84a94a1f505d6 100644 (file)
@@ -44,9 +44,6 @@ struct innolux_panel {
 
        struct regulator_bulk_data *supplies;
        struct gpio_desc *enable_gpio;
-
-       bool prepared;
-       bool enabled;
 };
 
 static inline struct innolux_panel *to_innolux_panel(struct drm_panel *panel)
@@ -54,26 +51,11 @@ static inline struct innolux_panel *to_innolux_panel(struct drm_panel *panel)
        return container_of(panel, struct innolux_panel, base);
 }
 
-static int innolux_panel_disable(struct drm_panel *panel)
-{
-       struct innolux_panel *innolux = to_innolux_panel(panel);
-
-       if (!innolux->enabled)
-               return 0;
-
-       innolux->enabled = false;
-
-       return 0;
-}
-
 static int innolux_panel_unprepare(struct drm_panel *panel)
 {
        struct innolux_panel *innolux = to_innolux_panel(panel);
        int err;
 
-       if (!innolux->prepared)
-               return 0;
-
        err = mipi_dsi_dcs_set_display_off(innolux->link);
        if (err < 0)
                dev_err(panel->dev, "failed to set display off: %d\n", err);
@@ -97,8 +79,6 @@ static int innolux_panel_unprepare(struct drm_panel *panel)
        if (err < 0)
                return err;
 
-       innolux->prepared = false;
-
        return 0;
 }
 
@@ -107,9 +87,6 @@ static int innolux_panel_prepare(struct drm_panel *panel)
        struct innolux_panel *innolux = to_innolux_panel(panel);
        int err;
 
-       if (innolux->prepared)
-               return 0;
-
        gpiod_set_value_cansleep(innolux->enable_gpio, 0);
 
        err = regulator_bulk_enable(innolux->desc->num_supplies,
@@ -149,8 +126,6 @@ static int innolux_panel_prepare(struct drm_panel *panel)
        /* T7: 5ms */
        usleep_range(5000, 6000);
 
-       innolux->prepared = true;
-
        return 0;
 
 poweroff:
@@ -160,18 +135,6 @@ poweroff:
        return err;
 }
 
-static int innolux_panel_enable(struct drm_panel *panel)
-{
-       struct innolux_panel *innolux = to_innolux_panel(panel);
-
-       if (innolux->enabled)
-               return 0;
-
-       innolux->enabled = true;
-
-       return 0;
-}
-
 static const char * const innolux_p079zca_supply_names[] = {
        "power",
 };
@@ -396,10 +359,8 @@ static int innolux_panel_get_modes(struct drm_panel *panel,
 }
 
 static const struct drm_panel_funcs innolux_panel_funcs = {
-       .disable = innolux_panel_disable,
        .unprepare = innolux_panel_unprepare,
        .prepare = innolux_panel_prepare,
-       .enable = innolux_panel_enable,
        .get_modes = innolux_panel_get_modes,
 };