diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2023-05-31 03:02:58 +0300 |
|---|---|---|
| committer | Neil Armstrong <neil.armstrong@linaro.org> | 2023-05-31 11:09:48 +0200 |
| commit | 99304fd0050314a0c998c28300393ec574998db9 (patch) | |
| tree | 57b7546c032b0c5ccdeba23c6cd6cb376644fb64 /drivers/gpu/drm/bridge | |
| parent | 41b74821751466457dc8b87606ac4d71ec568d4e (diff) | |
| download | linux-stable-99304fd0050314a0c998c28300393ec574998db9.tar.gz linux-stable-99304fd0050314a0c998c28300393ec574998db9.tar.bz2 linux-stable-99304fd0050314a0c998c28300393ec574998db9.zip | |
drm/bridge: display-connector: rename dp_pwr to connector_pwr
In preparation to adding support for the hdmi_pwr supply, rename dp_pwr
structure field to the generic connector_pwr.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230531000259.3758235-3-dmitry.baryshkov@linaro.org
Diffstat (limited to 'drivers/gpu/drm/bridge')
| -rw-r--r-- | drivers/gpu/drm/bridge/display-connector.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c index 56ae511367b1..cad3105ab186 100644 --- a/drivers/gpu/drm/bridge/display-connector.c +++ b/drivers/gpu/drm/bridge/display-connector.c @@ -24,7 +24,7 @@ struct display_connector { struct gpio_desc *hpd_gpio; int hpd_irq; - struct regulator *dp_pwr; + struct regulator *supply; struct gpio_desc *ddc_en; }; @@ -316,14 +316,14 @@ static int display_connector_probe(struct platform_device *pdev) if (type == DRM_MODE_CONNECTOR_DisplayPort) { int ret; - conn->dp_pwr = devm_regulator_get_optional(&pdev->dev, "dp-pwr"); + conn->supply = devm_regulator_get_optional(&pdev->dev, "dp-pwr"); - if (IS_ERR(conn->dp_pwr)) { - ret = PTR_ERR(conn->dp_pwr); + if (IS_ERR(conn->supply)) { + ret = PTR_ERR(conn->supply); switch (ret) { case -ENODEV: - conn->dp_pwr = NULL; + conn->supply = NULL; break; case -EPROBE_DEFER: @@ -335,8 +335,8 @@ static int display_connector_probe(struct platform_device *pdev) } } - if (conn->dp_pwr) { - ret = regulator_enable(conn->dp_pwr); + if (conn->supply) { + ret = regulator_enable(conn->supply); if (ret) { dev_err(&pdev->dev, "failed to enable DP PWR regulator: %d\n", ret); return ret; @@ -386,8 +386,8 @@ static void display_connector_remove(struct platform_device *pdev) if (conn->ddc_en) gpiod_set_value(conn->ddc_en, 0); - if (conn->dp_pwr) - regulator_disable(conn->dp_pwr); + if (conn->supply) + regulator_disable(conn->supply); drm_bridge_remove(&conn->bridge); |