drm/panel: olimex-lcd-olinuxino: Stop tracking prepared/enabled

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.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20240604172305.v3.5.I6a96d762be98321e02f56b5864359258d65d9da8@changeid
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240604172305.v3.5.I6a96d762be98321e02f56b5864359258d65d9da8@changeid

diff --git a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
index 4819ada694826887f9499fffac2f6afa132b3b85..8a687d3ba2367684b0c6c391a92a0798370b5022 100644 (file)
--- a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
+++ b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
@@ -64,9 +64,6 @@ struct lcd_olinuxino {
        struct i2c_client *client;
        struct mutex mutex;
 
-       bool prepared;
-       bool enabled;
-
        struct regulator *supply;
        struct gpio_desc *enable_gpio;
 
@@ -78,30 +75,13 @@ static inline struct lcd_olinuxino *to_lcd_olinuxino(struct drm_panel *panel)
        return container_of(panel, struct lcd_olinuxino, panel);
 }
 
-static int lcd_olinuxino_disable(struct drm_panel *panel)
-{
-       struct lcd_olinuxino *lcd = to_lcd_olinuxino(panel);
-
-       if (!lcd->enabled)
-               return 0;
-
-       lcd->enabled = false;
-
-       return 0;
-}
-
 static int lcd_olinuxino_unprepare(struct drm_panel *panel)
 {
        struct lcd_olinuxino *lcd = to_lcd_olinuxino(panel);
 
-       if (!lcd->prepared)
-               return 0;
-
        gpiod_set_value_cansleep(lcd->enable_gpio, 0);
        regulator_disable(lcd->supply);
 
-       lcd->prepared = false;
-
        return 0;
 }
 
@@ -110,27 +90,11 @@ static int lcd_olinuxino_prepare(struct drm_panel *panel)
        struct lcd_olinuxino *lcd = to_lcd_olinuxino(panel);
        int ret;
 
-       if (lcd->prepared)
-               return 0;
-
        ret = regulator_enable(lcd->supply);
        if (ret < 0)
                return ret;
 
        gpiod_set_value_cansleep(lcd->enable_gpio, 1);
-       lcd->prepared = true;
-
-       return 0;
-}
-
-static int lcd_olinuxino_enable(struct drm_panel *panel)
-{
-       struct lcd_olinuxino *lcd = to_lcd_olinuxino(panel);
-
-       if (lcd->enabled)
-               return 0;
-
-       lcd->enabled = true;
 
        return 0;
 }
@@ -195,10 +159,8 @@ static int lcd_olinuxino_get_modes(struct drm_panel *panel,
 }
 
 static const struct drm_panel_funcs lcd_olinuxino_funcs = {
-       .disable = lcd_olinuxino_disable,
        .unprepare = lcd_olinuxino_unprepare,
        .prepare = lcd_olinuxino_prepare,
-       .enable = lcd_olinuxino_enable,
        .get_modes = lcd_olinuxino_get_modes,
 };
 
@@ -264,9 +226,6 @@ static int lcd_olinuxino_probe(struct i2c_client *client)
                lcd->eeprom.num_modes = 4;
        }
 
-       lcd->enabled = false;
-       lcd->prepared = false;
-
        lcd->supply = devm_regulator_get(dev, "power");
        if (IS_ERR(lcd->supply))
                return PTR_ERR(lcd->supply);