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

diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c
index 56ae511..cad3105 100644 (file)
--- 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);