Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-22 07:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: hci_qca: Update regulator_set_load() usage

Browse Source 
Since the introduction of '5451781dadf8 ("regulator: core: Only count
load for enabled consumers")' in v5.0, the requested load of a regulator
consumer is only accounted for when said consumer is voted enabled.

So there's no need to vote for load ever time the regulator is
enabled or disabled.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Bjorn Andersson 2019-10-17 22:24:01 -07:00 committed by Marcel Holtmann
parent cde9dde6e1
commit c29ff107e0
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/bluetooth/hci_qca.c
View File

@ -1395,13 +1395,6 @@ static int qca_enable_regulator(struct qca_vreg vregs,
if (ret) if (ret)
return ret; return ret;
if (vregs.load_uA)
ret = regulator_set_load(regulator,
vregs.load_uA);
if (ret)
return ret;
return regulator_enable(regulator); return regulator_enable(regulator);
} }
@ -1411,8 +1404,6 @@ static void qca_disable_regulator(struct qca_vreg vregs,
{ {
regulator_disable(regulator); regulator_disable(regulator);
regulator_set_voltage(regulator, 0, vregs.max_uV); regulator_set_voltage(regulator, 0, vregs.max_uV);
if (vregs.load_uA)
regulator_set_load(regulator, 0);
} }
@ -1464,18 +1455,30 @@ static int qca_power_setup(struct hci_uart *hu, bool on)
static int qca_init_regulators(struct qca_power *qca, static int qca_init_regulators(struct qca_power *qca,
const struct qca_vreg *vregs, size_t num_vregs) const struct qca_vreg *vregs, size_t num_vregs)
{ {
struct regulator_bulk_data *bulk;
int ret;
int i; int i;
qca->vreg_bulk = devm_kcalloc(qca->dev, num_vregs, bulk = devm_kcalloc(qca->dev, num_vregs, sizeof(*bulk), GFP_KERNEL);
sizeof(struct regulator_bulk_data), if (!bulk)
GFP_KERNEL);
if (!qca->vreg_bulk)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < num_vregs; i++) for (i = 0; i < num_vregs; i++)
qca->vreg_bulk[i].supply = vregs[i].name; bulk[i].supply = vregs[i].name;
return devm_regulator_bulk_get(qca->dev, num_vregs, qca->vreg_bulk); ret = devm_regulator_bulk_get(qca->dev, num_vregs, bulk);
if (ret < 0)
return ret;
for (i = 0; i < num_vregs; i++) {
ret = regulator_set_load(bulk[i].consumer, vregs[i].load_uA);
if (ret)
return ret;
}
qca->vreg_bulk = bulk;
return 0;
} }
static int qca_serdev_probe(struct serdev_device *serdev) static int qca_serdev_probe(struct serdev_device *serdev)