Squash the disable() and unprepare() functions, since there is no need for host adjustments between them.
Signed-off-by: Svyatoslav Ryhel <[email protected]> --- drivers/gpu/drm/panel/panel-hitachi-tx10d07vm0baa.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-hitachi-tx10d07vm0baa.c b/drivers/gpu/drm/panel/panel-hitachi-tx10d07vm0baa.c index 318ece68b7806..153717ca6c90e 100644 --- a/drivers/gpu/drm/panel/panel-hitachi-tx10d07vm0baa.c +++ b/drivers/gpu/drm/panel/panel-hitachi-tx10d07vm0baa.c @@ -177,7 +177,7 @@ static int hitachi_tx10d07vm0baa_enable(struct drm_panel *panel) return 0; } -static int hitachi_tx10d07vm0baa_disable(struct drm_panel *panel) +static int hitachi_tx10d07vm0baa_unprepare(struct drm_panel *panel) { struct hitachi_tx10d07vm0baa *priv = to_hitachi_tx10d07vm0baa(panel); @@ -187,13 +187,6 @@ static int hitachi_tx10d07vm0baa_disable(struct drm_panel *panel) panel_dbi_command(priv, MIPI_DCS_ENTER_SLEEP_MODE); msleep(50); - return 0; -} - -static int hitachi_tx10d07vm0baa_unprepare(struct drm_panel *panel) -{ - struct hitachi_tx10d07vm0baa *priv = to_hitachi_tx10d07vm0baa(panel); - gpiod_set_value_cansleep(priv->reset_gpio, 1); regulator_bulk_disable(ARRAY_SIZE(hitachi_tx10d07vm0baa_supplies), priv->supplies); @@ -236,7 +229,6 @@ static int hitachi_tx10d07vm0baa_get_modes(struct drm_panel *panel, static const struct drm_panel_funcs hitachi_tx10d07vm0baa_panel_funcs = { .prepare = hitachi_tx10d07vm0baa_prepare, .enable = hitachi_tx10d07vm0baa_enable, - .disable = hitachi_tx10d07vm0baa_disable, .unprepare = hitachi_tx10d07vm0baa_unprepare, .get_modes = hitachi_tx10d07vm0baa_get_modes, }; -- 2.53.0
