]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/panel: seiko-43wvf1g: Stop tracking prepared/enabled
authorDouglas Anderson <dianders@chromium.org>
Wed, 5 Jun 2024 00:23:01 +0000 (17:23 -0700)
committerNeil Armstrong <neil.armstrong@linaro.org>
Tue, 11 Jun 2024 07:58:45 +0000 (09:58 +0200)
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: Marco Franchi <marco.franchi@nxp.com>
Cc: Fabio Estevam <festevam@denx.de>
Cc: Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: imx@lists.linux.dev
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.15.Idda91d310ca2e4f5a4ab4ca6eaf1afdaf14eeb51@changeid
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240604172305.v3.15.Idda91d310ca2e4f5a4ab4ca6eaf1afdaf14eeb51@changeid
drivers/gpu/drm/panel/panel-seiko-43wvf1g.c

index 658c7c04057028989b3a11df927a4de73496a588..98480904126c00f9d303a1420ec1079f0ec8648d 100644 (file)
@@ -44,8 +44,6 @@ struct seiko_panel_desc {
 
 struct seiko_panel {
        struct drm_panel base;
-       bool prepared;
-       bool enabled;
        const struct seiko_panel_desc *desc;
        struct regulator *dvdd;
        struct regulator *avdd;
@@ -122,25 +120,10 @@ static int seiko_panel_get_fixed_modes(struct seiko_panel *panel,
        return num;
 }
 
-static int seiko_panel_disable(struct drm_panel *panel)
-{
-       struct seiko_panel *p = to_seiko_panel(panel);
-
-       if (!p->enabled)
-               return 0;
-
-       p->enabled = false;
-
-       return 0;
-}
-
 static int seiko_panel_unprepare(struct drm_panel *panel)
 {
        struct seiko_panel *p = to_seiko_panel(panel);
 
-       if (!p->prepared)
-               return 0;
-
        gpiod_set_value_cansleep(p->enable_gpio, 0);
 
        regulator_disable(p->avdd);
@@ -150,8 +133,6 @@ static int seiko_panel_unprepare(struct drm_panel *panel)
 
        regulator_disable(p->dvdd);
 
-       p->prepared = false;
-
        return 0;
 }
 
@@ -160,9 +141,6 @@ static int seiko_panel_prepare(struct drm_panel *panel)
        struct seiko_panel *p = to_seiko_panel(panel);
        int err;
 
-       if (p->prepared)
-               return 0;
-
        err = regulator_enable(p->dvdd);
        if (err < 0) {
                dev_err(panel->dev, "failed to enable dvdd: %d\n", err);
@@ -180,8 +158,6 @@ static int seiko_panel_prepare(struct drm_panel *panel)
 
        gpiod_set_value_cansleep(p->enable_gpio, 1);
 
-       p->prepared = true;
-
        return 0;
 
 disable_dvdd:
@@ -189,18 +165,6 @@ disable_dvdd:
        return err;
 }
 
-static int seiko_panel_enable(struct drm_panel *panel)
-{
-       struct seiko_panel *p = to_seiko_panel(panel);
-
-       if (p->enabled)
-               return 0;
-
-       p->enabled = true;
-
-       return 0;
-}
-
 static int seiko_panel_get_modes(struct drm_panel *panel,
                                 struct drm_connector *connector)
 {
@@ -228,10 +192,8 @@ static int seiko_panel_get_timings(struct drm_panel *panel,
 }
 
 static const struct drm_panel_funcs seiko_panel_funcs = {
-       .disable = seiko_panel_disable,
        .unprepare = seiko_panel_unprepare,
        .prepare = seiko_panel_prepare,
-       .enable = seiko_panel_enable,
        .get_modes = seiko_panel_get_modes,
        .get_timings = seiko_panel_get_timings,
 };
@@ -246,8 +208,6 @@ static int seiko_panel_probe(struct device *dev,
        if (!panel)
                return -ENOMEM;
 
-       panel->enabled = false;
-       panel->prepared = false;
        panel->desc = desc;
 
        panel->dvdd = devm_regulator_get(dev, "dvdd");