Commit ff1eae12 authored by Matti Vaittinen's avatar Matti Vaittinen Committed by Neil Armstrong

drm/bridge: sii902x: Use devm_regulator_bulk_get_enable()

Simplify using devm_regulator_bulk_get_enable()
Signed-off-by: default avatarMatti Vaittinen <mazziesaccount@gmail.com>
Acked-by: default avatarRobert Foss <robert.foss@linaro.org>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/e6153c7beb2076b9ea13082b2024ec3296bc08bc.1669799805.git.mazziesaccount@gmail.com
parent 7b4668e4
...@@ -171,7 +171,6 @@ struct sii902x { ...@@ -171,7 +171,6 @@ struct sii902x {
struct drm_connector connector; struct drm_connector connector;
struct gpio_desc *reset_gpio; struct gpio_desc *reset_gpio;
struct i2c_mux_core *i2cmux; struct i2c_mux_core *i2cmux;
struct regulator_bulk_data supplies[2];
bool sink_is_hdmi; bool sink_is_hdmi;
/* /*
* Mutex protects audio and video functions from interfering * Mutex protects audio and video functions from interfering
...@@ -1072,6 +1071,7 @@ static int sii902x_probe(struct i2c_client *client, ...@@ -1072,6 +1071,7 @@ static int sii902x_probe(struct i2c_client *client,
struct device *dev = &client->dev; struct device *dev = &client->dev;
struct device_node *endpoint; struct device_node *endpoint;
struct sii902x *sii902x; struct sii902x *sii902x;
static const char * const supplies[] = {"iovcc", "cvcc12"};
int ret; int ret;
ret = i2c_check_functionality(client->adapter, ret = i2c_check_functionality(client->adapter,
...@@ -1122,27 +1122,11 @@ static int sii902x_probe(struct i2c_client *client, ...@@ -1122,27 +1122,11 @@ static int sii902x_probe(struct i2c_client *client,
mutex_init(&sii902x->mutex); mutex_init(&sii902x->mutex);
sii902x->supplies[0].supply = "iovcc"; ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(supplies), supplies);
sii902x->supplies[1].supply = "cvcc12";
ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(sii902x->supplies),
sii902x->supplies);
if (ret < 0) if (ret < 0)
return ret; return dev_err_probe(dev, ret, "Failed to enable supplies");
ret = regulator_bulk_enable(ARRAY_SIZE(sii902x->supplies),
sii902x->supplies);
if (ret < 0) {
dev_err_probe(dev, ret, "Failed to enable supplies");
return ret;
}
ret = sii902x_init(sii902x); return sii902x_init(sii902x);
if (ret < 0) {
regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies),
sii902x->supplies);
}
return ret;
} }
static void sii902x_remove(struct i2c_client *client) static void sii902x_remove(struct i2c_client *client)
...@@ -1152,8 +1136,6 @@ static void sii902x_remove(struct i2c_client *client) ...@@ -1152,8 +1136,6 @@ static void sii902x_remove(struct i2c_client *client)
i2c_mux_del_adapters(sii902x->i2cmux); i2c_mux_del_adapters(sii902x->i2cmux);
drm_bridge_remove(&sii902x->bridge); drm_bridge_remove(&sii902x->bridge);
regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies),
sii902x->supplies);
} }
static const struct of_device_id sii902x_dt_ids[] = { static const struct of_device_id sii902x_dt_ids[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment