On Fri, 01 Dec 2023, Hans de Goede <hdego...@redhat.com> wrote:
> soc_gpio_set_value() already uses devm_gpiod_get(), lets be consistent
> and use devm_gpiod_get() for all GPIOs.
>
> This allows removing the intel_dsi_vbt_gpio_cleanup() function,
> which only function was to put the GPIO-descriptors.
>
> Signed-off-by: Hans de Goede <hdego...@redhat.com>
Acked-by: Jani Nikula <jani.nik...@intel.com>
> ---
> Note this applies on top of Andy's recent GPIO rework series which
> has just landed in drm-intel-next
> ---
> drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 17 ++---------------
> drivers/gpu/drm/i915/display/intel_dsi_vbt.h | 1 -
> drivers/gpu/drm/i915/display/vlv_dsi.c | 10 +---------
> 3 files changed, 3 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> index 275d0218394c..a5d7fc8418c9 100644
> --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> @@ -922,7 +922,7 @@ void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi,
> bool panel_is_on)
> gpiod_add_lookup_table(gpiod_lookup_table);
>
> if (want_panel_gpio) {
> - intel_dsi->gpio_panel = gpiod_get(dev->dev, "panel", flags);
> + intel_dsi->gpio_panel = devm_gpiod_get(dev->dev, "panel",
> flags);
> if (IS_ERR(intel_dsi->gpio_panel)) {
> drm_err(&dev_priv->drm,
> "Failed to own gpio for panel control\n");
> @@ -932,7 +932,7 @@ void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi,
> bool panel_is_on)
>
> if (want_backlight_gpio) {
> intel_dsi->gpio_backlight =
> - gpiod_get(dev->dev, "backlight", flags);
> + devm_gpiod_get(dev->dev, "backlight", flags);
> if (IS_ERR(intel_dsi->gpio_backlight)) {
> drm_err(&dev_priv->drm,
> "Failed to own gpio for backlight control\n");
> @@ -943,16 +943,3 @@ void intel_dsi_vbt_gpio_init(struct intel_dsi
> *intel_dsi, bool panel_is_on)
> if (gpiod_lookup_table)
> gpiod_remove_lookup_table(gpiod_lookup_table);
> }
> -
> -void intel_dsi_vbt_gpio_cleanup(struct intel_dsi *intel_dsi)
> -{
> - if (intel_dsi->gpio_panel) {
> - gpiod_put(intel_dsi->gpio_panel);
> - intel_dsi->gpio_panel = NULL;
> - }
> -
> - if (intel_dsi->gpio_backlight) {
> - gpiod_put(intel_dsi->gpio_backlight);
> - intel_dsi->gpio_backlight = NULL;
> - }
> -}
> diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.h
> b/drivers/gpu/drm/i915/display/intel_dsi_vbt.h
> index 468d873fab1a..3462fcc760e6 100644
> --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.h
> +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.h
> @@ -13,7 +13,6 @@ struct intel_dsi;
>
> bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id);
> void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi, bool panel_is_on);
> -void intel_dsi_vbt_gpio_cleanup(struct intel_dsi *intel_dsi);
> void intel_dsi_vbt_exec_sequence(struct intel_dsi *intel_dsi,
> enum mipi_seq seq_id);
> void intel_dsi_log_params(struct intel_dsi *intel_dsi);
> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c
> b/drivers/gpu/drm/i915/display/vlv_dsi.c
> index 5bda97c96810..9b33b8a74d64 100644
> --- a/drivers/gpu/drm/i915/display/vlv_dsi.c
> +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
> @@ -1532,16 +1532,8 @@ static void intel_dsi_unprepare(struct intel_encoder
> *encoder)
> }
> }
>
> -static void intel_dsi_encoder_destroy(struct drm_encoder *encoder)
> -{
> - struct intel_dsi *intel_dsi =
> enc_to_intel_dsi(to_intel_encoder(encoder));
> -
> - intel_dsi_vbt_gpio_cleanup(intel_dsi);
> - intel_encoder_destroy(encoder);
> -}
> -
> static const struct drm_encoder_funcs intel_dsi_funcs = {
> - .destroy = intel_dsi_encoder_destroy,
> + .destroy = intel_encoder_destroy,
> };
>
> static enum drm_mode_status vlv_dsi_mode_valid(struct drm_connector
> *connector,
--
Jani Nikula, Intel
