Skip to contentSkip to conversation

3rd set of IIO export namspaces.

PATCH Superseded Jonathan Cameron 2 participants 8 messages Feb 20, 2022 – Jun 4, 2022

Subsystems (5)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jonathan Cameron

author maintainer
#0 lore raw

cover 3rd set of IIO export namspaces.

From: Jonathan Cameron <[email protected]>

Several of these are old drivers so I'm not sure the original maintainer / author will take a look so if anyone else has time it would be appreciated. These are fairly mechanical so hopefully easy to review!

Another set where we are moving symbols intended for local use between a clump of related modules into separate namespaces. These are of the multiple buses + core module or library module plus users variety.

The remaining cases in IIO are more complex so will be handled in future patch sets. Typically this is because of interactions with code outside of IIO or clashes with the dev_pm_ops cleanup that is also ongoing.

Cc Tomasz Duszynski <[email protected]>
Cc Nuno Sá <[email protected]>
Cc Dmitry Baryshkov <[email protected]>
Cc Siddartha Mohanadoss <[email protected]>

Jonathan Cameron (5):
iio: imu: bmi160: Move exported symbols to IIO_BMI160 namespace
iio: pressure: bmp280: Move symbol exports to IIO_BMP280 namespace
iio: chemical: sps30: Move symbol exports into IIO_SPS30 namespace
iio: adc: adi-axi: Move exported symbols into IIO_ADI_AXI namespace.
iio: adc: qcom-vadc: Move symbol exports to IIO_QCOM_VADC namespace

 drivers/iio/adc/ad9467.c             |  1 +
 drivers/iio/adc/adi-axi-adc.c        |  4 ++--
 drivers/iio/adc/qcom-pm8xxx-xoadc.c  |  1 +
 drivers/iio/adc/qcom-spmi-adc5.c     |  1 +
 drivers/iio/adc/qcom-spmi-vadc.c     |  1 +
 drivers/iio/adc/qcom-vadc-common.c   | 16 ++++++++--------
 drivers/iio/chemical/sps30.c         |  2 +-
 drivers/iio/chemical/sps30_i2c.c     |  1 +
 drivers/iio/chemical/sps30_serial.c  |  1 +
 drivers/iio/imu/bmi160/bmi160_core.c |  6 +++---
 drivers/iio/imu/bmi160/bmi160_i2c.c  |  1 +
 drivers/iio/imu/bmi160/bmi160_spi.c  |  1 +
 drivers/iio/pressure/bmp280-core.c   |  2 +-
 drivers/iio/pressure/bmp280-i2c.c    |  1 +
 drivers/iio/pressure/bmp280-regmap.c |  4 ++--
 drivers/iio/pressure/bmp280-spi.c    |  1 +
 16 files changed, 27 insertions(+), 17 deletions(-)
Signature · 1 line
2.35.1
author maintainer
#1 lore raw

PATCH 1/5 iio: imu: bmi160: Move exported symbols to IIO_BMI160 namespace

From: Jonathan Cameron <[email protected]>

Avoid unnecessary pollution of the global symbol namespace by moving library functions in to a specific namespace and import that into the drivers that make use of the functions.

For more info: https://lwn.net/Articles/760045/

---
 drivers/iio/imu/bmi160/bmi160_core.c | 6 +++---
 drivers/iio/imu/bmi160/bmi160_i2c.c  | 1 +
 drivers/iio/imu/bmi160/bmi160_spi.c  | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)
drivers/iio/imu/bmi160/bmi160_core.c +3 -3
index 824b5124a5f5..40dfea70d73a 100644
@@ -144,7 +144,7 @@ const struct regmap_config bmi160_regmap_config = {
 	.reg_bits = 8,
 	.val_bits = 8,
 };
-EXPORT_SYMBOL(bmi160_regmap_config);
+EXPORT_SYMBOL_NS(bmi160_regmap_config, IIO_BMI160);
 
 struct bmi160_regs {
 	u8 data; /* LSB byte register for X-axis */
@@ -645,7 +645,7 @@ int bmi160_enable_irq(struct regmap *regmap, bool enable)
 				     BMI160_DRDY_INT_EN, enable_bit,
 				     BMI160_NORMAL_WRITE_USLEEP);
 }
-EXPORT_SYMBOL(bmi160_enable_irq);
+EXPORT_SYMBOL_NS(bmi160_enable_irq, IIO_BMI160);
 
 static int bmi160_get_irq(struct device_node *of_node, enum bmi160_int_pin *pin)
 {
@@ -891,7 +891,7 @@ int bmi160_core_probe(struct device *dev, struct regmap *regmap,
 
 	return devm_iio_device_register(dev, indio_dev);
 }
-EXPORT_SYMBOL_GPL(bmi160_core_probe);
+EXPORT_SYMBOL_NS_GPL(bmi160_core_probe, IIO_BMI160);
 
 MODULE_AUTHOR("Daniel Baluta <[email protected]>");
 MODULE_DESCRIPTION("Bosch BMI160 driver");
drivers/iio/imu/bmi160/bmi160_i2c.c +1 -0
index 26398614eddf..8a62c1d3669d 100644
@@ -69,3 +69,4 @@ module_i2c_driver(bmi160_i2c_driver);
 MODULE_AUTHOR("Daniel Baluta <[email protected]>");
 MODULE_DESCRIPTION("BMI160 I2C driver");
 MODULE_LICENSE("GPL v2");
+MODULE_IMPORT_NS(IIO_BMI160);
drivers/iio/imu/bmi160/bmi160_spi.c +1 -0
index 61389b41c6d9..f78998089f25 100644
@@ -61,3 +61,4 @@ module_spi_driver(bmi160_spi_driver);
 MODULE_AUTHOR("Daniel Baluta <[email protected]");
 MODULE_DESCRIPTION("Bosch BMI160 SPI driver");
 MODULE_LICENSE("GPL v2");
+MODULE_IMPORT_NS(IIO_BMI160);
Signature · 1 line
2.35.1
author maintainer
#2 lore raw

PATCH 2/5 iio: pressure: bmp280: Move symbol exports to IIO_BMP280 namespace

In reply to Jonathan Cameron

From: Jonathan Cameron <[email protected]>

Avoid unnecessary pollution of the global symbol namespace by moving library functions in to a specific namespace and import that into the drivers that make use of the functions.

For more info: https://lwn.net/Articles/760045/

---
 drivers/iio/pressure/bmp280-core.c   | 2 +-
 drivers/iio/pressure/bmp280-i2c.c    | 1 +
 drivers/iio/pressure/bmp280-regmap.c | 4 ++--
 drivers/iio/pressure/bmp280-spi.c    | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)
drivers/iio/pressure/bmp280-core.c +1 -1
index bf8167f43c56..fe7aa81e7cc9 100644
@@ -1136,7 +1136,7 @@ int bmp280_common_probe(struct device *dev,
 
 	return devm_iio_device_register(dev, indio_dev);
 }
-EXPORT_SYMBOL(bmp280_common_probe);
+EXPORT_SYMBOL_NS(bmp280_common_probe, IIO_BMP280);
 
 static int bmp280_runtime_suspend(struct device *dev)
 {
drivers/iio/pressure/bmp280-i2c.c +1 -0
index 35045bd92846..bf4a7a617537 100644
@@ -68,3 +68,4 @@ module_i2c_driver(bmp280_i2c_driver);
 MODULE_AUTHOR("Vlad Dogaru <[email protected]>");
 MODULE_DESCRIPTION("Driver for Bosch Sensortec BMP180/BMP280 pressure and temperature sensor");
 MODULE_LICENSE("GPL v2");
+MODULE_IMPORT_NS(IIO_BMP280);
drivers/iio/pressure/bmp280-regmap.c +2 -2
index da136dbadc8f..969698518984 100644
@@ -39,7 +39,7 @@ const struct regmap_config bmp180_regmap_config = {
 	.writeable_reg = bmp180_is_writeable_reg,
 	.volatile_reg = bmp180_is_volatile_reg,
 };
-EXPORT_SYMBOL(bmp180_regmap_config);
+EXPORT_SYMBOL_NS(bmp180_regmap_config, IIO_BMP280);
 
 static bool bmp280_is_writeable_reg(struct device *dev, unsigned int reg)
 {
@@ -82,4 +82,4 @@ const struct regmap_config bmp280_regmap_config = {
 	.writeable_reg = bmp280_is_writeable_reg,
 	.volatile_reg = bmp280_is_volatile_reg,
 };
-EXPORT_SYMBOL(bmp280_regmap_config);
+EXPORT_SYMBOL_NS(bmp280_regmap_config, IIO_BMP280);
drivers/iio/pressure/bmp280-spi.c +1 -0
index 41f6cc56d229..4cfaf3e869b8 100644
@@ -118,3 +118,4 @@ module_spi_driver(bmp280_spi_driver);
 
 MODULE_DESCRIPTION("BMP280 SPI bus driver");
 MODULE_LICENSE("GPL");
+MODULE_IMPORT_NS(IIO_BMP280);
Signature · 1 line
2.35.1
author maintainer
#3 lore raw

PATCH 3/5 iio: chemical: sps30: Move symbol exports into IIO_SPS30 namespace

In reply to Jonathan Cameron

From: Jonathan Cameron <[email protected]>

Avoid unnecessary pollution of the global symbol namespace by moving library functions in to a specific namespace and import that into the drivers that make use of the functions.

For more info: https://lwn.net/Articles/760045/

---
 drivers/iio/chemical/sps30.c        | 2 +-
 drivers/iio/chemical/sps30_i2c.c    | 1 +
 drivers/iio/chemical/sps30_serial.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
drivers/iio/chemical/sps30.c +1 -1
index abd67559e451..814ce0aad1cc 100644
@@ -372,7 +372,7 @@ int sps30_probe(struct device *dev, const char *name, void *priv, const struct s
 
 	return devm_iio_device_register(dev, indio_dev);
 }
-EXPORT_SYMBOL_GPL(sps30_probe);
+EXPORT_SYMBOL_NS_GPL(sps30_probe, IIO_SPS30);
 
 MODULE_AUTHOR("Tomasz Duszynski <[email protected]>");
 MODULE_DESCRIPTION("Sensirion SPS30 particulate matter sensor driver");
drivers/iio/chemical/sps30_i2c.c +1 -0
index d33560ed7184..2aed483a2fde 100644
@@ -256,3 +256,4 @@ module_i2c_driver(sps30_i2c_driver);
 MODULE_AUTHOR("Tomasz Duszynski <[email protected]>");
 MODULE_DESCRIPTION("Sensirion SPS30 particulate matter sensor i2c driver");
 MODULE_LICENSE("GPL v2");
+MODULE_IMPORT_NS(IIO_SPS30);
drivers/iio/chemical/sps30_serial.c +1 -0
index 3f311d50087c..164f4b3e025c 100644
@@ -429,3 +429,4 @@ module_serdev_device_driver(sps30_serial_driver);
 MODULE_AUTHOR("Tomasz Duszynski <[email protected]>");
 MODULE_DESCRIPTION("Sensirion SPS30 particulate matter sensor serial driver");
 MODULE_LICENSE("GPL v2");
+MODULE_IMPORT_NS(IIO_SPS30);
Signature · 1 line
2.35.1
author maintainer
#4 lore raw

PATCH 4/5 iio: adc: adi-axi: Move exported symbols into IIO_ADI_AXI namespace.

In reply to Jonathan Cameron

From: Jonathan Cameron <[email protected]>

Avoid unnecessary pollution of the global symbol namespace by moving library functions in to a specific namespace and import that into the drivers that make use of the functions.

For more info: https://lwn.net/Articles/760045/

---
 drivers/iio/adc/ad9467.c      | 1 +
 drivers/iio/adc/adi-axi-adc.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/iio/adc/ad9467.c +1 -0
index dbfc8517cb8a..5a5f33f7bc8f 100644
@@ -474,3 +474,4 @@ module_spi_driver(ad9467_driver);
 MODULE_AUTHOR("Michael Hennerich <[email protected]>");
 MODULE_DESCRIPTION("Analog Devices AD9467 ADC driver");
 MODULE_LICENSE("GPL v2");
+MODULE_IMPORT_NS(IIO_ADI_AXI);
drivers/iio/adc/adi-axi-adc.c +2 -2
index a73e3c2d212f..cf07d522925e 100644
@@ -86,7 +86,7 @@ void *adi_axi_adc_conv_priv(struct adi_axi_adc_conv *conv)
 
 	return (char *)cl + ALIGN(sizeof(struct adi_axi_adc_client), IIO_ALIGN);
 }
-EXPORT_SYMBOL_GPL(adi_axi_adc_conv_priv);
+EXPORT_SYMBOL_NS_GPL(adi_axi_adc_conv_priv, IIO_ADI_AXI);
 
 static void adi_axi_adc_write(struct adi_axi_adc_state *st,
 			      unsigned int reg,
@@ -224,7 +224,7 @@ struct adi_axi_adc_conv *devm_adi_axi_adc_conv_register(struct device *dev,
 
 	return conv;
 }
-EXPORT_SYMBOL_GPL(devm_adi_axi_adc_conv_register);
+EXPORT_SYMBOL_NS_GPL(devm_adi_axi_adc_conv_register, IIO_ADI_AXI);
 
 static ssize_t in_voltage_scale_available_show(struct device *dev,
 					       struct device_attribute *attr,
Signature · 1 line
2.35.1
author maintainer
#7 lore raw

PATCH 5/5 iio: adc: qcom-vadc: Move symbol exports to IIO_QCOM_VADC namespace

In reply to Jonathan Cameron

From: Jonathan Cameron <[email protected]>

Avoid unnecessary pollution of the global symbol namespace by moving library functions in to a specific namespace and import that into the drivers that make use of the functions.

For more info: https://lwn.net/Articles/760045/

Cc Dmitry Baryshkov <[email protected]>
Cc Siddartha Mohanadoss <[email protected]>
---
 drivers/iio/adc/qcom-pm8xxx-xoadc.c |  1 +
 drivers/iio/adc/qcom-spmi-adc5.c    |  1 +
 drivers/iio/adc/qcom-spmi-vadc.c    |  1 +
 drivers/iio/adc/qcom-vadc-common.c  | 16 ++++++++--------
 4 files changed, 11 insertions(+), 8 deletions(-)
drivers/iio/adc/qcom-pm8xxx-xoadc.c +1 -0
index 5e9e56821075..e2ef89dcaa5e 100644
@@ -1028,3 +1028,4 @@ module_platform_driver(pm8xxx_xoadc_driver);
 MODULE_DESCRIPTION("PM8xxx XOADC driver");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:pm8xxx-xoadc");
+MODULE_IMPORT_NS(IIO_QCOM_VADC);
drivers/iio/adc/qcom-spmi-adc5.c +1 -0
index 87438d1e5c0b..10bb51b648c1 100644
@@ -925,3 +925,4 @@ module_platform_driver(adc5_driver);
 MODULE_ALIAS("platform:qcom-spmi-adc5");
 MODULE_DESCRIPTION("Qualcomm Technologies Inc. PMIC5 ADC driver");
 MODULE_LICENSE("GPL v2");
+MODULE_IMPORT_NS(IIO_QCOM_VADC);
drivers/iio/adc/qcom-spmi-vadc.c +1 -0
index 34202ba52469..cb0c6af091ac 100644
@@ -935,3 +935,4 @@ MODULE_DESCRIPTION("Qualcomm SPMI PMIC voltage ADC driver");
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Stanimir Varbanov <[email protected]>");
 MODULE_AUTHOR("Ivan T. Ivanov <[email protected]>");
+MODULE_IMPORT_NS(IIO_QCOM_VADC);
drivers/iio/adc/qcom-vadc-common.c +8 -8
index 6c6aec848f98..e1ff2ac309fd 100644
@@ -662,7 +662,7 @@ int qcom_vadc_scale(enum vadc_scale_fn_type scaletype,
 		return -EINVAL;
 	}
 }
-EXPORT_SYMBOL(qcom_vadc_scale);
+EXPORT_SYMBOL_NS(qcom_vadc_scale, IIO_QCOM_VADC);
 
 u16 qcom_adc_tm5_temp_volt_scale(unsigned int prescale_ratio,
 				 u32 full_scale_code_volt, int temp)
@@ -675,7 +675,7 @@ u16 qcom_adc_tm5_temp_volt_scale(unsigned int prescale_ratio,
 					     temp);
 	return qcom_vadc_scale_voltage_code(voltage, prescale, full_scale_code_volt, 1000);
 }
-EXPORT_SYMBOL(qcom_adc_tm5_temp_volt_scale);
+EXPORT_SYMBOL_NS(qcom_adc_tm5_temp_volt_scale, IIO_QCOM_VADC);
 
 int qcom_adc5_hw_scale(enum vadc_scale_fn_type scaletype,
 		    unsigned int prescale_ratio,
@@ -693,7 +693,7 @@ int qcom_adc5_hw_scale(enum vadc_scale_fn_type scaletype,
 	return scale_adc5_fn[scaletype].scale_fn(prescale, data,
 					adc_code, result);
 }
-EXPORT_SYMBOL(qcom_adc5_hw_scale);
+EXPORT_SYMBOL_NS(qcom_adc5_hw_scale, IIO_QCOM_VADC);
 
 int qcom_adc5_prescaling_from_dt(u32 numerator, u32 denominator)
 {
@@ -709,7 +709,7 @@ int qcom_adc5_prescaling_from_dt(u32 numerator, u32 denominator)
 
 	return pre;
 }
-EXPORT_SYMBOL(qcom_adc5_prescaling_from_dt);
+EXPORT_SYMBOL_NS(qcom_adc5_prescaling_from_dt, IIO_QCOM_VADC);
 
 int qcom_adc5_hw_settle_time_from_dt(u32 value,
 				     const unsigned int *hw_settle)
@@ -723,7 +723,7 @@ int qcom_adc5_hw_settle_time_from_dt(u32 value,
 
 	return -EINVAL;
 }
-EXPORT_SYMBOL(qcom_adc5_hw_settle_time_from_dt);
+EXPORT_SYMBOL_NS(qcom_adc5_hw_settle_time_from_dt, IIO_QCOM_VADC);
 
 int qcom_adc5_avg_samples_from_dt(u32 value)
 {
@@ -732,7 +732,7 @@ int qcom_adc5_avg_samples_from_dt(u32 value)
 
 	return __ffs(value);
 }
-EXPORT_SYMBOL(qcom_adc5_avg_samples_from_dt);
+EXPORT_SYMBOL_NS(qcom_adc5_avg_samples_from_dt, IIO_QCOM_VADC);
 
 int qcom_adc5_decimation_from_dt(u32 value, const unsigned int *decimation)
 {
@@ -745,7 +745,7 @@ int qcom_adc5_decimation_from_dt(u32 value, const unsigned int *decimation)
 
 	return -EINVAL;
 }
-EXPORT_SYMBOL(qcom_adc5_decimation_from_dt);
+EXPORT_SYMBOL_NS(qcom_adc5_decimation_from_dt, IIO_QCOM_VADC);
 
 int qcom_vadc_decimation_from_dt(u32 value)
 {
@@ -755,7 +755,7 @@ int qcom_vadc_decimation_from_dt(u32 value)
 
 	return __ffs64(value / VADC_DECIMATION_MIN);
 }
-EXPORT_SYMBOL(qcom_vadc_decimation_from_dt);
+EXPORT_SYMBOL_NS(qcom_vadc_decimation_from_dt, IIO_QCOM_VADC);
 
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Qualcomm ADC common functionality");
Signature · 1 line
2.35.1
maintainer Reviewed-by on v1 4/5
#5 lore raw

RE: [PATCH 4/5] iio: adc: adi-axi: Move exported symbols into IIO_ADI_AXI namespace.

In reply to Jonathan Cameron
Quoted 17 lines

From: Jonathan Cameron <[email protected]>
Sent: Sunday, February 20, 2022 6:37 PM
To: [email protected]
Cc: Jonathan Cameron <[email protected]>; Sa, Nuno <[email protected]>
Subject: [PATCH 4/5] iio: adc: adi-axi: Move exported symbols into IIO_ADI_AXI namespace.

[External]

From: Jonathan Cameron <[email protected]>

Avoid unnecessary pollution of the global symbol namespace by moving library functions in to a specific namespace and import that into the drivers that make use of the functions.

Quoted 8 lines

For more info:
https://urldefense.com/v3/__https://lwn.net/Articles/760045/__;!!A
3Ni8CS0y2Y!qj7laM0qKDhsEb1sYjTacTG-
mo7keClzXaoXpymZHqh9LV3hfXIgR01onST88w$

---

author maintainer Applied
#6 lore raw

Re: [PATCH 4/5] iio: adc: adi-axi: Move exported symbols into IIO_ADI_AXI namespace.

Quoted 21 lines · Nuno
Quoted 21 lines

From: Jonathan Cameron <[email protected]>
Sent: Sunday, February 20, 2022 6:37 PM
To: [email protected]
Cc: Jonathan Cameron <[email protected]>; Sa, Nuno <[email protected]>
Subject: [PATCH 4/5] iio: adc: adi-axi: Move exported symbols into IIO_ADI_AXI namespace.

[External]

From: Jonathan Cameron <[email protected]>

Avoid unnecessary pollution of the global symbol namespace by moving library functions in to a specific namespace and import that into the drivers that make use of the functions.

For more info:
https://urldefense.com/v3/__https://lwn.net/Articles/760045/__;!!A
3Ni8CS0y2Y!qj7laM0qKDhsEb1sYjTacTG-
mo7keClzXaoXpymZHqh9LV3hfXIgR01onST88w$

Quoted 6 lines
Quoted 3 lines

---

Applied. I was waiting on someone hopefully looking at the rest of the series, but as that hasn't happened yet, might as well pick this one up!

Thanks,

Jonathan