Merge series "regulator: Fix W=1 build warning when CONFIG_OF=n" from Jisheng... (23ce1e5c) · Commits · 戴 / test

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

drivers/regulator/88pg86x.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ static int pg86x_i2c_probe(struct i2c_client *i2c)
		return 0;
		}

		static const struct of_device_id pg86x_dt_ids [] = {
		static const struct of_device_id __maybe_unused pg86x_dt_ids[] = {
		{ .compatible = "marvell,88pg867" },
		{ .compatible = "marvell,88pg868" },
		{ }

drivers/regulator/da9210-regulator.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ error_i2c:
		* I2C driver interface functions
		*/

		static const struct of_device_id da9210_dt_ids[] = {
		static const struct of_device_id __maybe_unused da9210_dt_ids[] = {
		{ .compatible = "dlg,da9210", },
		{ }
		};

drivers/regulator/fan53555.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -436,7 +436,7 @@ static struct fan53555_platform_data fan53555_parse_dt(struct device dev,
		return pdata;
		}

		static const struct of_device_id fan53555_dt_ids[] = {
		static const struct of_device_id __maybe_unused fan53555_dt_ids[] = {
		{
		.compatible = "fcs,fan53526",
		.data = (void *)FAN53526_VENDOR_FAIRCHILD,

drivers/regulator/fixed.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -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",

drivers/regulator/ltc3589.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -457,7 +457,7 @@ static const struct i2c_device_id ltc3589_i2c_id[] = {
		};
		MODULE_DEVICE_TABLE(i2c, ltc3589_i2c_id);

		static const struct of_device_id ltc3589_of_match[] = {
		static const struct of_device_id __maybe_unused ltc3589_of_match[] = {
		{
		.compatible = "lltc,ltc3589",
		.data = (void *)LTC3589,

Admin message