Commit db45a699 authored by Douglas Anderson's avatar Douglas Anderson Committed by Neil Armstrong

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

As talked about in commit d2aacaf0 ("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: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20240604172305.v3.5.I6a96d762be98321e02f56b5864359258d65d9da8@changeidSigned-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240604172305.v3.5.I6a96d762be98321e02f56b5864359258d65d9da8@changeid
parent 6ac427c0
...@@ -64,9 +64,6 @@ struct lcd_olinuxino { ...@@ -64,9 +64,6 @@ struct lcd_olinuxino {
struct i2c_client *client; struct i2c_client *client;
struct mutex mutex; struct mutex mutex;
bool prepared;
bool enabled;
struct regulator *supply; struct regulator *supply;
struct gpio_desc *enable_gpio; struct gpio_desc *enable_gpio;
...@@ -78,30 +75,13 @@ static inline struct lcd_olinuxino *to_lcd_olinuxino(struct drm_panel *panel) ...@@ -78,30 +75,13 @@ static inline struct lcd_olinuxino *to_lcd_olinuxino(struct drm_panel *panel)
return container_of(panel, struct lcd_olinuxino, 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) static int lcd_olinuxino_unprepare(struct drm_panel *panel)
{ {
struct lcd_olinuxino *lcd = to_lcd_olinuxino(panel); struct lcd_olinuxino *lcd = to_lcd_olinuxino(panel);
if (!lcd->prepared)
return 0;
gpiod_set_value_cansleep(lcd->enable_gpio, 0); gpiod_set_value_cansleep(lcd->enable_gpio, 0);
regulator_disable(lcd->supply); regulator_disable(lcd->supply);
lcd->prepared = false;
return 0; return 0;
} }
...@@ -110,27 +90,11 @@ static int lcd_olinuxino_prepare(struct drm_panel *panel) ...@@ -110,27 +90,11 @@ static int lcd_olinuxino_prepare(struct drm_panel *panel)
struct lcd_olinuxino *lcd = to_lcd_olinuxino(panel); struct lcd_olinuxino *lcd = to_lcd_olinuxino(panel);
int ret; int ret;
if (lcd->prepared)
return 0;
ret = regulator_enable(lcd->supply); ret = regulator_enable(lcd->supply);
if (ret < 0) if (ret < 0)
return ret; return ret;
gpiod_set_value_cansleep(lcd->enable_gpio, 1); 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; return 0;
} }
...@@ -195,10 +159,8 @@ static int lcd_olinuxino_get_modes(struct drm_panel *panel, ...@@ -195,10 +159,8 @@ static int lcd_olinuxino_get_modes(struct drm_panel *panel,
} }
static const struct drm_panel_funcs lcd_olinuxino_funcs = { static const struct drm_panel_funcs lcd_olinuxino_funcs = {
.disable = lcd_olinuxino_disable,
.unprepare = lcd_olinuxino_unprepare, .unprepare = lcd_olinuxino_unprepare,
.prepare = lcd_olinuxino_prepare, .prepare = lcd_olinuxino_prepare,
.enable = lcd_olinuxino_enable,
.get_modes = lcd_olinuxino_get_modes, .get_modes = lcd_olinuxino_get_modes,
}; };
...@@ -264,9 +226,6 @@ static int lcd_olinuxino_probe(struct i2c_client *client) ...@@ -264,9 +226,6 @@ static int lcd_olinuxino_probe(struct i2c_client *client)
lcd->eeprom.num_modes = 4; lcd->eeprom.num_modes = 4;
} }
lcd->enabled = false;
lcd->prepared = false;
lcd->supply = devm_regulator_get(dev, "power"); lcd->supply = devm_regulator_get(dev, "power");
if (IS_ERR(lcd->supply)) if (IS_ERR(lcd->supply))
return PTR_ERR(lcd->supply); return PTR_ERR(lcd->supply);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment