Skip to content

Commit 4de7715

Browse files
committed
drm/i915/dsi: Use devm_gpiod_get() for all GPIOs
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 <hdegoede@redhat.com> Reviewed-by: Andy Shevchenko <andy@kernel.org> Acked-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231201161130.23976-1-hdegoede@redhat.com
1 parent 1116efb commit 4de7715

3 files changed

Lines changed: 3 additions & 25 deletions

File tree

drivers/gpu/drm/i915/display/intel_dsi_vbt.c

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi, bool panel_is_on)
922922
gpiod_add_lookup_table(gpiod_lookup_table);
923923

924924
if (want_panel_gpio) {
925-
intel_dsi->gpio_panel = gpiod_get(dev->dev, "panel", flags);
925+
intel_dsi->gpio_panel = devm_gpiod_get(dev->dev, "panel", flags);
926926
if (IS_ERR(intel_dsi->gpio_panel)) {
927927
drm_err(&dev_priv->drm,
928928
"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)
932932

933933
if (want_backlight_gpio) {
934934
intel_dsi->gpio_backlight =
935-
gpiod_get(dev->dev, "backlight", flags);
935+
devm_gpiod_get(dev->dev, "backlight", flags);
936936
if (IS_ERR(intel_dsi->gpio_backlight)) {
937937
drm_err(&dev_priv->drm,
938938
"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)
943943
if (gpiod_lookup_table)
944944
gpiod_remove_lookup_table(gpiod_lookup_table);
945945
}
946-
947-
void intel_dsi_vbt_gpio_cleanup(struct intel_dsi *intel_dsi)
948-
{
949-
if (intel_dsi->gpio_panel) {
950-
gpiod_put(intel_dsi->gpio_panel);
951-
intel_dsi->gpio_panel = NULL;
952-
}
953-
954-
if (intel_dsi->gpio_backlight) {
955-
gpiod_put(intel_dsi->gpio_backlight);
956-
intel_dsi->gpio_backlight = NULL;
957-
}
958-
}

drivers/gpu/drm/i915/display/intel_dsi_vbt.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ struct intel_dsi;
1313

1414
bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id);
1515
void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi, bool panel_is_on);
16-
void intel_dsi_vbt_gpio_cleanup(struct intel_dsi *intel_dsi);
1716
void intel_dsi_vbt_exec_sequence(struct intel_dsi *intel_dsi,
1817
enum mipi_seq seq_id);
1918
void intel_dsi_log_params(struct intel_dsi *intel_dsi);

drivers/gpu/drm/i915/display/vlv_dsi.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,16 +1532,8 @@ static void intel_dsi_unprepare(struct intel_encoder *encoder)
15321532
}
15331533
}
15341534

1535-
static void intel_dsi_encoder_destroy(struct drm_encoder *encoder)
1536-
{
1537-
struct intel_dsi *intel_dsi = enc_to_intel_dsi(to_intel_encoder(encoder));
1538-
1539-
intel_dsi_vbt_gpio_cleanup(intel_dsi);
1540-
intel_encoder_destroy(encoder);
1541-
}
1542-
15431535
static const struct drm_encoder_funcs intel_dsi_funcs = {
1544-
.destroy = intel_dsi_encoder_destroy,
1536+
.destroy = intel_encoder_destroy,
15451537
};
15461538

15471539
static enum drm_mode_status vlv_dsi_mode_valid(struct drm_connector *connector,

0 commit comments

Comments
 (0)