Commit c553aa1b authored by David Lechner's avatar David Lechner Committed by Jonathan Cameron
Browse files

iio: adc: ad7173: fix compiling without gpiolib 



Fix compiling the ad7173 driver when CONFIG_GPIOLIB is not set by
selecting GPIOLIB to be always enabled and remove the #if.

Commit 031bdc8a ("iio: adc: ad7173: add calibration support") placed
unrelated code in the middle of the #if IS_ENABLED(CONFIG_GPIOLIB) block
which caused the reported compile error.

However, later commit 7530ed2a ("iio: adc: ad7173: add openwire
detection support for single conversions") makes use of the gpio regmap
even when we aren't providing gpio controller support. So it makes more
sense to always enable GPIOLIB rather than trying to make it optional.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202504220824.HVrTVov1-lkp@intel.com/


Fixes: 031bdc8a ("iio: adc: ad7173: add calibration support")
Signed-off-by: default avatarDavid Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20250422-iio-adc-ad7173-fix-compile-without-gpiolib-v1-1-295f2c990754@baylibre.com


Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 65995e97

drivers/iio/adc/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -129,8 +129,9 @@ config AD7173 
	tristate "Analog Devices AD7173 driver"

	depends on SPI_MASTER

	select AD_SIGMA_DELTA

	select GPIO_REGMAP if GPIOLIB

	select REGMAP_SPI if GPIOLIB

	select GPIOLIB

	select GPIO_REGMAP

	select REGMAP_SPI

	help

	  Say yes here to build support for Analog Devices AD7173 and similar ADC

	  Currently supported models:

drivers/iio/adc/ad7173.c

+1 −14
Original line number Diff line number Diff line
@@ -230,10 +230,8 @@ struct ad7173_state { 
	unsigned long long *config_cnts;

	struct clk *ext_clk;

	struct clk_hw int_clk_hw;

#if IS_ENABLED(CONFIG_GPIOLIB)

	struct regmap *reg_gpiocon_regmap;

	struct gpio_regmap *gpio_regmap;

#endif

};



static unsigned int ad4115_sinc5_data_rates[] = {
@@ -288,8 +286,6 @@ static const char *const ad7173_clk_sel[] = { 
	"ext-clk", "xtal"

};



#if IS_ENABLED(CONFIG_GPIOLIB)



static const struct regmap_range ad7173_range_gpio[] = {

	regmap_reg_range(AD7173_REG_GPIO, AD7173_REG_GPIO),

};
@@ -543,12 +539,6 @@ static int ad7173_gpio_init(struct ad7173_state *st) 


	return 0;

}

#else

static int ad7173_gpio_init(struct ad7173_state *st)

{

	return 0;

}

#endif /* CONFIG_GPIOLIB */



static struct ad7173_state *ad_sigma_delta_to_ad7173(struct ad_sigma_delta *sd)

{
@@ -1797,10 +1787,7 @@ static int ad7173_probe(struct spi_device *spi) 
	if (ret)

		return ret;



	if (IS_ENABLED(CONFIG_GPIOLIB))

	return ad7173_gpio_init(st);



	return 0;

}



static const struct of_device_id ad7173_of_match[] = {