@@ -24,7 +24,7 @@ struct display_connector {
struct gpio_desc *hpd_gpio;
int hpd_irq;
- struct regulator *dp_pwr;
+ struct regulator *connector_pwr;
struct gpio_desc *ddc_en;
};
@@ -319,14 +319,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->connector_pwr = devm_regulator_get_optional(&pdev->dev, "dp-pwr");
- if (IS_ERR(conn->dp_pwr)) {
- ret = PTR_ERR(conn->dp_pwr);
+ if (IS_ERR(conn->connector_pwr)) {
+ ret = PTR_ERR(conn->connector_pwr);
switch (ret) {
case -ENODEV:
- conn->dp_pwr = NULL;
+ conn->connector_pwr = NULL;
break;
case -EPROBE_DEFER:
@@ -338,8 +338,8 @@ static int display_connector_probe(struct platform_device *pdev)
}
}
- if (conn->dp_pwr) {
- ret = regulator_enable(conn->dp_pwr);
+ if (conn->connector_pwr) {
+ ret = regulator_enable(conn->connector_pwr);
if (ret) {
dev_err(&pdev->dev, "failed to enable DP PWR regulator: %d\n", ret);
return ret;
@@ -389,8 +389,8 @@ static int 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->connector_pwr)
+ regulator_disable(conn->connector_pwr);
drm_bridge_remove(&conn->bridge);
In preparation to adding support for the hdmi_pwr supply, rename dp_pwr structure field to the generic connector_pwr. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/bridge/display-connector.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)