mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
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
This commit is contained in:
parent
1116efbff3
commit
4de77156a2
3 changed files with 3 additions and 25 deletions
|
@ -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);
|
gpiod_add_lookup_table(gpiod_lookup_table);
|
||||||
|
|
||||||
if (want_panel_gpio) {
|
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)) {
|
if (IS_ERR(intel_dsi->gpio_panel)) {
|
||||||
drm_err(&dev_priv->drm,
|
drm_err(&dev_priv->drm,
|
||||||
"Failed to own gpio for panel control\n");
|
"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) {
|
if (want_backlight_gpio) {
|
||||||
intel_dsi->gpio_backlight =
|
intel_dsi->gpio_backlight =
|
||||||
gpiod_get(dev->dev, "backlight", flags);
|
devm_gpiod_get(dev->dev, "backlight", flags);
|
||||||
if (IS_ERR(intel_dsi->gpio_backlight)) {
|
if (IS_ERR(intel_dsi->gpio_backlight)) {
|
||||||
drm_err(&dev_priv->drm,
|
drm_err(&dev_priv->drm,
|
||||||
"Failed to own gpio for backlight control\n");
|
"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)
|
if (gpiod_lookup_table)
|
||||||
gpiod_remove_lookup_table(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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -13,7 +13,6 @@ struct intel_dsi;
|
||||||
|
|
||||||
bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id);
|
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_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,
|
void intel_dsi_vbt_exec_sequence(struct intel_dsi *intel_dsi,
|
||||||
enum mipi_seq seq_id);
|
enum mipi_seq seq_id);
|
||||||
void intel_dsi_log_params(struct intel_dsi *intel_dsi);
|
void intel_dsi_log_params(struct intel_dsi *intel_dsi);
|
||||||
|
|
|
@ -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 = {
|
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,
|
static enum drm_mode_status vlv_dsi_mode_valid(struct drm_connector *connector,
|
||||||
|
|
Loading…
Reference in a new issue