mfd: max77686: Don't define dummy function if OF isn't enabled (154409e4) · Commits · 戴 / test

When the CONFIG_OF option was not enabled, a dummy function max77686_i2c_parse_dt_pdata() was defined since this is called unconditionally on probe(). Just always define the real function and conditionally call it if CONFIG_OF is enabled instead. Signed-off-by:

Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by:

Lee Jones <lee.jones@linaro.org>

drivers/mfd/max77686.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -96,7 +96,6 @@ static const struct regmap_irq_chip max77686_rtc_irq_chip = {
		.num_irqs = ARRAY_SIZE(max77686_rtc_irqs),
		};

		#ifdef CONFIG_OF
		static const struct of_device_id max77686_pmic_dt_match[] = {
		{.compatible = "maxim,max77686", .data = NULL},
		{},
		@@ -116,13 +115,6 @@ static struct max77686_platform_data *max77686_i2c_parse_dt_pdata(struct device
		dev->platform_data = pd;
		return pd;
		}
		#else
		static struct max77686_platform_data *max77686_i2c_parse_dt_pdata(struct device
		*dev)
		{
		return 0;
		}
		#endif

		static int max77686_i2c_probe(struct i2c_client *i2c,
		const struct i2c_device_id *id)
		@@ -132,7 +124,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
		unsigned int data;
		int ret = 0;

		if (i2c->dev.of_node)
		if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node)
		pdata = max77686_i2c_parse_dt_pdata(&i2c->dev);

		if (!pdata) {

Admin message