diff options
| author | Linus Torvalds | 2017-02-21 02:23:57 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-02-21 02:23:57 +0100 |
| commit | f790bd9c8e826434ab6c326b225276ed0f73affe (patch) | |
| tree | 58c7f3c0d5bf1cd2131592219178d0e57b3afd1a /drivers/regulator/axp20x-regulator.c | |
| parent | Merge tag 'regmap-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff) | |
| parent | Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/su... (diff) | |
| download | kernel-qcow2-linux-f790bd9c8e826434ab6c326b225276ed0f73affe.tar.gz kernel-qcow2-linux-f790bd9c8e826434ab6c326b225276ed0f73affe.tar.xz kernel-qcow2-linux-f790bd9c8e826434ab6c326b225276ed0f73affe.zip | |
Merge tag 'regulator-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown:
"Quite a lot of work going on the core this release, mainly around
system initialization, but a quiet release for drivers:
- fixes for registration of multiple regulators on a PMIC from Javier
Martinez Canillas and Jon Hunter.
- cleanups to the regulator_get() code from Dmitry Torokhov
- lots of constifcation of structs from Bhumika Goyal
- support for Motorola CPCAP regulators from Tony Lindgren"
* tag 'regulator-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (52 commits)
regulator: core: Resolve supplies before disabling unused regulators
regulator: Fix regulator_summary for deviceless consumers
regulator: tps65086: Fix DT node referencing in of_parse_cb
regulator: tps65086: Fix expected switch DT node names
regulator: core: simplify _regulator_get()
regulator: core: have regulator_dev_lookup() return ERR_PTR-encoded errors
regulator: gpio: correct default type
regulator: cpcap: Add basic regulator support
regulator: core: fix typo in regulator_bulk_disable()
regulator: core: optimize devm_regulator_bulk_get()
regulator: core: simplify regulator_bulk_force_disable()
regulator: core: have _regulator_get() accept get_type argument
regulator: core: remove dead code in _regulator_get()
regulator: rn5t618: constify regulator_ops structure
regulator: rc5t583-regulator: constify regulator_ops structure
regulator: pv88090-regulator: constify regulator_ops structure
regulator: pv88080-regulator: constify regulator_ops structure
regulator: pv88060-regulator: constify regulator_ops structure
regulator: pfuze100-regulator: constify regulator_ops structure
regulator: pcf50633-regulator: constify regulator_ops structure
...
Diffstat (limited to 'drivers/regulator/axp20x-regulator.c')
| -rw-r--r-- | drivers/regulator/axp20x-regulator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c index a3ade9e4ef47..0b9d4e3e52c7 100644 --- a/drivers/regulator/axp20x-regulator.c +++ b/drivers/regulator/axp20x-regulator.c @@ -128,11 +128,11 @@ .ops = &axp20x_ops_range, \ } -static struct regulator_ops axp20x_ops_fixed = { +static const struct regulator_ops axp20x_ops_fixed = { .list_voltage = regulator_list_voltage_linear, }; -static struct regulator_ops axp20x_ops_range = { +static const struct regulator_ops axp20x_ops_range = { .set_voltage_sel = regulator_set_voltage_sel_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap, .list_voltage = regulator_list_voltage_linear_range, @@ -141,7 +141,7 @@ static struct regulator_ops axp20x_ops_range = { .is_enabled = regulator_is_enabled_regmap, }; -static struct regulator_ops axp20x_ops = { +static const struct regulator_ops axp20x_ops = { .set_voltage_sel = regulator_set_voltage_sel_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap, .list_voltage = regulator_list_voltage_linear, @@ -150,7 +150,7 @@ static struct regulator_ops axp20x_ops = { .is_enabled = regulator_is_enabled_regmap, }; -static struct regulator_ops axp20x_ops_sw = { +static const struct regulator_ops axp20x_ops_sw = { .enable = regulator_enable_regmap, .disable = regulator_disable_regmap, .is_enabled = regulator_is_enabled_regmap, |