diff options
| author | Mark Brown <broonie@kernel.org> | 2020-08-21 17:38:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-08-21 17:38:50 +0100 |
| commit | 23ce1e5c27396e39efabb58714142e8f10ce1f0c (patch) | |
| tree | 6ecc14ce468c9a8dfc8a6a3fc2f3f1653255d460 /drivers/regulator/fixed.c | |
| parent | c0e53a448637366064d4b9ce586b68ced679cd22 (diff) | |
| parent | 8536bf811dd7a25d90d9128f9db98b5ed8e5bd5c (diff) | |
Merge series "regulator: Fix W=1 build warning when CONFIG_OF=n" from Jisheng Zhang <Jisheng.Zhang@synaptics.com>:
Fixing W=1 build warning when no support for device tree is there.
Since v1:
- fix the warning with __maybe_unused instead of CONFIG_OF macro
- add 3 more patches to fix the same issue
Jisheng Zhang (15):
regulator: 88pg86x: Fix W=1 build warning when CONFIG_OF=n
regulator: da9210: Fix W=1 build warning when CONFIG_OF=n
regulator: fan53555: Fix W=1 build warning when CONFIG_OF=n
regulator: fixed: Fix W=1 build warnings when CONFIG_OF=n
regulator: ltc3589: Fix W=1 build warning when CONFIG_OF=n
regulator: ltc3676: Fix W=1 build warning when CONFIG_OF=n
regulator: max1586: Fix W=1 build warning when CONFIG_OF=n
regulator: max77826: Fix W=1 build warning when CONFIG_OF=n
regulator: pwm: Fix W=1 build warning when CONFIG_OF=n
regulator: stm32-pwr: Fix W=1 build warning when CONFIG_OF=n
regulator: stm32-vrefbuf: Fix W=1 build warning when CONFIG_OF=n
regulator: sy8106a: Fix W=1 build warning when CONFIG_OF=n
regulator: qcom-rpmh: Fix W=1 build warning when CONFIG_OF=n
regulator: stm32-booster: Fix W=1 build warning when CONFIG_OF=n
regulator: tps65023: Fix W=1 build warning when CONFIG_OF=n
drivers/regulator/88pg86x.c | 2 +-
drivers/regulator/da9210-regulator.c | 2 +-
drivers/regulator/fan53555.c | 2 +-
drivers/regulator/fixed.c | 16 ++++++++--------
drivers/regulator/ltc3589.c | 2 +-
drivers/regulator/ltc3676.c | 2 +-
drivers/regulator/max1586.c | 2 +-
drivers/regulator/max77826-regulator.c | 2 +-
drivers/regulator/pwm-regulator.c | 2 +-
drivers/regulator/qcom-rpmh-regulator.c | 2 +-
drivers/regulator/stm32-booster.c | 2 +-
drivers/regulator/stm32-pwr.c | 2 +-
drivers/regulator/stm32-vrefbuf.c | 2 +-
drivers/regulator/sy8106a-regulator.c | 2 +-
drivers/regulator/tps65023-regulator.c | 2 +-
15 files changed, 22 insertions(+), 22 deletions(-)
--
2.28.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Diffstat (limited to 'drivers/regulator/fixed.c')
| -rw-r--r-- | drivers/regulator/fixed.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index 142a70a89153..5a03fd86ad0a 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -41,14 +41,6 @@ struct fixed_dev_type { bool has_enable_clock; }; -static const struct fixed_dev_type fixed_voltage_data = { - .has_enable_clock = false, -}; - -static const struct fixed_dev_type fixed_clkenable_data = { - .has_enable_clock = true, -}; - static int reg_clock_enable(struct regulator_dev *rdev) { struct fixed_voltage_data *priv = rdev_get_drvdata(rdev); @@ -260,6 +252,14 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) } #if defined(CONFIG_OF) +static const struct fixed_dev_type fixed_voltage_data = { + .has_enable_clock = false, +}; + +static const struct fixed_dev_type fixed_clkenable_data = { + .has_enable_clock = true, +}; + static const struct of_device_id fixed_of_match[] = { { .compatible = "regulator-fixed", |