* [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE
@ 2017-05-29 15:51 Jonathan Cameron
2017-05-29 15:51 ` [PATCH 01/38] iio: Use macro magic to avoid manual assign of driver_module Jonathan Cameron
` (37 more replies)
0 siblings, 38 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
This has been in the todo list for quite some time. There are two
places in IIO in which every driver assigns THIS_MODULE to a structure
element, so that the core can correctly assign ownership of various
resources.
With a simple macro, and moving the actual element used to store these
out of the relevant ops structures we can remove the necessity to do
this leading to a reduction in boilerplate.
We have a few iio drivers as part of other drivers outside of IIO, but
I have hopefully caught all of those.
I've split it mainly up into directories just to avoid having several
hundred patches for such a trivial per driver change. I'm not going
to attempt to put together a coherent cc list for these and instead
am mostly just going to post them to the mailing list for general
review.
Thanks,
Jonathan
Jonathan Cameron (38):
iio: Use macro magic to avoid manual assign of driver_module
iio: triggers: Use macros to avoid boilerplate assignment of owner.
coccinelle: Add an iio_no_owner semantic patch to drop driver_owner
iio:adc: drop assign iio_info.driver_module and iio_trigger_ops.owner
iio:accel: drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:amplifiers:ad8366 drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:chemical: drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:common: drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:counter:104-quad-8 drop assign iio_info.driver_module
iio:dac: drop assignment of iio_info.driver_module
iio:dummy: drop assignment of iio_info.driver_module
iio:frequency: drop assign iio_info.driver_module
iio:gyro: drop assign iio_info.driver_module and iio_trigger_ops.owner
iio:health: drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:humidity: drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:imu: drop assign iio_info.driver_module and iio_trigger_ops.owner
iio:light: drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:magnetometer: drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:orientation: drop assign iio_info.driver_module
iio:dpot: drop assign iio_info.driver_module
iio:potentiostat:lmp91000 drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:pressure: drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:proximity: drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:temperature: drop assignment of iio_info.driver_module
iio:triggers: drop assign iio_info.driver_module and
iio_trigger_ops.owner
staging:iio:accel: drop assignment of iio_info.driver_module
staging:iio:adc: drop assign iio_info.driver_module
staging:iio:cdc: drop assign iio_info.driver_module
staging:iio:frequency: drop assign iio_info.driver_module
staging:iio:gyro:adis16060 drop assign iio_info.driver_module
staging:iio:ad5933: drop assign iio_info.driver_module
staging:iio:meter: drop assign iio_info.driver_module and
iio_trigger_ops.owner
iio:resolver: drop assignment of iio_info.driver_module
iio:adc: drop assignment of iio_trigger_ops.owner
staging:iio:light:tsl2x7x drop assignment of driver_module
input: tsc2007 - drop the driver_module assignment in iio interface.
platform/x86: toshiba_acpi: drop assignment of iio_info.driver_module
iio: drop iio_info.driver_module and iio_trigger_ops.owner.
drivers/iio/accel/adxl345_core.c | 1 -
drivers/iio/accel/bma180.c | 2 -
drivers/iio/accel/bma220_spi.c | 1 -
drivers/iio/accel/bmc150-accel-core.c | 3 -
drivers/iio/accel/da280.c | 1 -
drivers/iio/accel/da311.c | 1 -
drivers/iio/accel/dmard06.c | 1 -
drivers/iio/accel/dmard09.c | 1 -
drivers/iio/accel/dmard10.c | 1 -
drivers/iio/accel/hid-sensor-accel-3d.c | 1 -
drivers/iio/accel/kxcjk-1013.c | 2 -
drivers/iio/accel/kxsd9.c | 1 -
drivers/iio/accel/mc3230.c | 1 -
drivers/iio/accel/mma7455_core.c | 1 -
drivers/iio/accel/mma7660.c | 1 -
drivers/iio/accel/mma8452.c | 2 -
drivers/iio/accel/mma9551.c | 1 -
drivers/iio/accel/mma9553.c | 1 -
drivers/iio/accel/mxc4005.c | 2 -
drivers/iio/accel/mxc6255.c | 1 -
drivers/iio/accel/sca3000.c | 1 -
drivers/iio/accel/st_accel_core.c | 2 -
drivers/iio/accel/stk8312.c | 2 -
drivers/iio/accel/stk8ba50.c | 2 -
drivers/iio/adc/ad7266.c | 1 -
drivers/iio/adc/ad7291.c | 1 -
drivers/iio/adc/ad7298.c | 1 -
drivers/iio/adc/ad7476.c | 1 -
drivers/iio/adc/ad7766.c | 2 -
drivers/iio/adc/ad7791.c | 2 -
drivers/iio/adc/ad7793.c | 2 -
drivers/iio/adc/ad7887.c | 1 -
drivers/iio/adc/ad7923.c | 1 -
drivers/iio/adc/ad799x.c | 3 -
drivers/iio/adc/ad_sigma_delta.c | 1 -
drivers/iio/adc/aspeed_adc.c | 1 -
drivers/iio/adc/at91-sama5d2_adc.c | 1 -
drivers/iio/adc/at91_adc.c | 2 -
drivers/iio/adc/axp288_adc.c | 1 -
drivers/iio/adc/bcm_iproc_adc.c | 1 -
drivers/iio/adc/berlin2-adc.c | 1 -
drivers/iio/adc/cc10001_adc.c | 1 -
drivers/iio/adc/cpcap-adc.c | 1 -
drivers/iio/adc/da9150-gpadc.c | 1 -
drivers/iio/adc/envelope-detector.c | 1 -
drivers/iio/adc/exynos_adc.c | 1 -
drivers/iio/adc/hi8435.c | 1 -
drivers/iio/adc/hx711.c | 1 -
drivers/iio/adc/imx7d_adc.c | 1 -
drivers/iio/adc/ina2xx-adc.c | 1 -
drivers/iio/adc/lp8788_adc.c | 1 -
drivers/iio/adc/lpc18xx_adc.c | 1 -
drivers/iio/adc/lpc32xx_adc.c | 1 -
drivers/iio/adc/ltc2485.c | 1 -
drivers/iio/adc/ltc2497.c | 1 -
drivers/iio/adc/max1027.c | 2 -
drivers/iio/adc/max11100.c | 1 -
drivers/iio/adc/max1118.c | 1 -
drivers/iio/adc/max1363.c | 2 -
drivers/iio/adc/max9611.c | 1 -
drivers/iio/adc/mcp320x.c | 1 -
drivers/iio/adc/mcp3422.c | 1 -
drivers/iio/adc/men_z188_adc.c | 1 -
drivers/iio/adc/meson_saradc.c | 1 -
drivers/iio/adc/mt6577_auxadc.c | 1 -
drivers/iio/adc/mxs-lradc-adc.c | 2 -
drivers/iio/adc/nau7802.c | 1 -
drivers/iio/adc/palmas_gpadc.c | 1 -
drivers/iio/adc/qcom-pm8xxx-xoadc.c | 1 -
drivers/iio/adc/qcom-spmi-iadc.c | 1 -
drivers/iio/adc/qcom-spmi-vadc.c | 1 -
drivers/iio/adc/rcar-gyroadc.c | 1 -
drivers/iio/adc/rockchip_saradc.c | 1 -
drivers/iio/adc/spear_adc.c | 1 -
drivers/iio/adc/stm32-adc.c | 1 -
drivers/iio/adc/stx104.c | 1 -
drivers/iio/adc/sun4i-gpadc-iio.c | 1 -
drivers/iio/adc/ti-adc081c.c | 1 -
drivers/iio/adc/ti-adc0832.c | 1 -
drivers/iio/adc/ti-adc084s021.c | 1 -
drivers/iio/adc/ti-adc108s102.c | 1 -
drivers/iio/adc/ti-adc12138.c | 1 -
drivers/iio/adc/ti-adc128s052.c | 1 -
drivers/iio/adc/ti-adc161s626.c | 1 -
drivers/iio/adc/ti-ads1015.c | 2 -
drivers/iio/adc/ti-ads7950.c | 1 -
drivers/iio/adc/ti-ads8688.c | 1 -
drivers/iio/adc/ti-tlc4541.c | 1 -
drivers/iio/adc/ti_am335x_adc.c | 1 -
drivers/iio/adc/twl4030-madc.c | 1 -
drivers/iio/adc/twl6030-gpadc.c | 1 -
drivers/iio/adc/vf610_adc.c | 1 -
drivers/iio/adc/viperboard_adc.c | 1 -
drivers/iio/adc/xilinx-xadc-core.c | 2 -
drivers/iio/amplifiers/ad8366.c | 1 -
drivers/iio/chemical/ams-iaq-core.c | 1 -
drivers/iio/chemical/atlas-ph-sensor.c | 2 -
drivers/iio/chemical/vz89x.c | 1 -
.../iio/common/cros_ec_sensors/cros_ec_sensors.c | 1 -
.../iio/common/hid-sensors/hid-sensor-trigger.c | 1 -
drivers/iio/counter/104-quad-8.c | 1 -
drivers/iio/dac/ad5064.c | 1 -
drivers/iio/dac/ad5360.c | 1 -
drivers/iio/dac/ad5380.c | 1 -
drivers/iio/dac/ad5421.c | 1 -
drivers/iio/dac/ad5446.c | 1 -
drivers/iio/dac/ad5449.c | 1 -
drivers/iio/dac/ad5504.c | 1 -
drivers/iio/dac/ad5592r-base.c | 1 -
drivers/iio/dac/ad5624r_spi.c | 1 -
drivers/iio/dac/ad5686.c | 1 -
drivers/iio/dac/ad5755.c | 1 -
drivers/iio/dac/ad5761.c | 1 -
drivers/iio/dac/ad5764.c | 1 -
drivers/iio/dac/ad5791.c | 1 -
drivers/iio/dac/ad7303.c | 1 -
drivers/iio/dac/ad8801.c | 1 -
drivers/iio/dac/cio-dac.c | 1 -
drivers/iio/dac/dpot-dac.c | 1 -
drivers/iio/dac/lpc18xx_dac.c | 1 -
drivers/iio/dac/ltc2632.c | 1 -
drivers/iio/dac/m62332.c | 1 -
drivers/iio/dac/max517.c | 1 -
drivers/iio/dac/max5821.c | 1 -
drivers/iio/dac/mcp4725.c | 1 -
drivers/iio/dac/mcp4922.c | 1 -
drivers/iio/dac/stm32-dac.c | 1 -
drivers/iio/dac/vf610_dac.c | 1 -
drivers/iio/dummy/iio_simple_dummy.c | 1 -
drivers/iio/frequency/ad9523.c | 1 -
drivers/iio/frequency/adf4350.c | 1 -
drivers/iio/gyro/adis16080.c | 1 -
drivers/iio/gyro/adis16130.c | 1 -
drivers/iio/gyro/adis16136.c | 1 -
drivers/iio/gyro/adis16260.c | 1 -
drivers/iio/gyro/adxrs450.c | 1 -
drivers/iio/gyro/bmg160_core.c | 2 -
drivers/iio/gyro/hid-sensor-gyro-3d.c | 1 -
drivers/iio/gyro/itg3200_buffer.c | 1 -
drivers/iio/gyro/itg3200_core.c | 1 -
drivers/iio/gyro/mpu3050-core.c | 2 -
drivers/iio/gyro/st_gyro_core.c | 2 -
drivers/iio/health/afe4403.c | 2 -
drivers/iio/health/afe4404.c | 2 -
drivers/iio/health/max30100.c | 1 -
drivers/iio/health/max30102.c | 1 -
drivers/iio/humidity/am2315.c | 1 -
drivers/iio/humidity/dht11.c | 1 -
drivers/iio/humidity/hdc100x.c | 1 -
drivers/iio/humidity/hid-sensor-humidity.c | 1 -
drivers/iio/humidity/hts221_buffer.c | 1 -
drivers/iio/humidity/hts221_core.c | 1 -
drivers/iio/humidity/htu21.c | 1 -
drivers/iio/humidity/si7005.c | 1 -
drivers/iio/humidity/si7020.c | 1 -
drivers/iio/imu/adis16400_core.c | 1 -
drivers/iio/imu/adis16480.c | 1 -
drivers/iio/imu/adis_trigger.c | 1 -
drivers/iio/imu/bmi160/bmi160_core.c | 1 -
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 1 -
drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 1 -
drivers/iio/imu/kmx61.c | 3 -
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 -
drivers/iio/industrialio-core.c | 35 +++-----
drivers/iio/industrialio-trigger.c | 24 +++---
drivers/iio/light/acpi-als.c | 1 -
drivers/iio/light/adjd_s311.c | 1 -
drivers/iio/light/al3320a.c | 1 -
drivers/iio/light/apds9300.c | 2 -
drivers/iio/light/apds9960.c | 1 -
drivers/iio/light/bh1750.c | 1 -
drivers/iio/light/bh1780.c | 1 -
drivers/iio/light/cm32181.c | 1 -
drivers/iio/light/cm3232.c | 1 -
drivers/iio/light/cm3323.c | 1 -
drivers/iio/light/cm3605.c | 1 -
drivers/iio/light/cm36651.c | 1 -
drivers/iio/light/cros_ec_light_prox.c | 1 -
drivers/iio/light/gp2ap020a00f.c | 2 -
drivers/iio/light/hid-sensor-als.c | 1 -
drivers/iio/light/hid-sensor-prox.c | 1 -
drivers/iio/light/isl29018.c | 2 -
drivers/iio/light/isl29028.c | 1 -
drivers/iio/light/isl29125.c | 1 -
drivers/iio/light/jsa1212.c | 1 -
drivers/iio/light/lm3533-als.c | 1 -
drivers/iio/light/ltr501.c | 4 -
drivers/iio/light/max44000.c | 1 -
drivers/iio/light/opt3001.c | 1 -
drivers/iio/light/pa12203001.c | 1 -
drivers/iio/light/rpr0521.c | 1 -
drivers/iio/light/si1145.c | 3 -
drivers/iio/light/stk3310.c | 1 -
drivers/iio/light/tcs3414.c | 1 -
drivers/iio/light/tcs3472.c | 1 -
drivers/iio/light/tsl2563.c | 2 -
drivers/iio/light/tsl2583.c | 1 -
drivers/iio/light/tsl4531.c | 1 -
drivers/iio/light/us5182d.c | 1 -
drivers/iio/light/vcnl4000.c | 1 -
drivers/iio/light/veml6070.c | 1 -
drivers/iio/light/vl6180.c | 1 -
drivers/iio/magnetometer/ak8974.c | 1 -
drivers/iio/magnetometer/ak8975.c | 1 -
drivers/iio/magnetometer/bmc150_magn.c | 2 -
drivers/iio/magnetometer/hid-sensor-magn-3d.c | 1 -
drivers/iio/magnetometer/hmc5843_core.c | 1 -
drivers/iio/magnetometer/mag3110.c | 1 -
drivers/iio/magnetometer/mmc35240.c | 1 -
drivers/iio/magnetometer/st_magn_core.c | 2 -
drivers/iio/orientation/hid-sensor-incl-3d.c | 1 -
drivers/iio/orientation/hid-sensor-rotation.c | 1 -
drivers/iio/potentiometer/ds1803.c | 1 -
drivers/iio/potentiometer/max5481.c | 1 -
drivers/iio/potentiometer/max5487.c | 1 -
drivers/iio/potentiometer/mcp4131.c | 1 -
drivers/iio/potentiometer/mcp4531.c | 1 -
drivers/iio/potentiometer/tpl0102.c | 1 -
drivers/iio/potentiostat/lmp91000.c | 2 -
drivers/iio/pressure/abp060mg.c | 1 -
drivers/iio/pressure/bmp280-core.c | 1 -
drivers/iio/pressure/cros_ec_baro.c | 1 -
drivers/iio/pressure/hid-sensor-press.c | 1 -
drivers/iio/pressure/hp03.c | 1 -
drivers/iio/pressure/hp206c.c | 1 -
drivers/iio/pressure/mpl115.c | 1 -
drivers/iio/pressure/mpl3115.c | 1 -
drivers/iio/pressure/ms5611_core.c | 1 -
drivers/iio/pressure/ms5637.c | 1 -
drivers/iio/pressure/st_pressure_core.c | 2 -
drivers/iio/pressure/t5403.c | 1 -
drivers/iio/pressure/zpa2326.c | 2 -
drivers/iio/proximity/as3935.c | 2 -
drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 1 -
drivers/iio/proximity/srf04.c | 1 -
drivers/iio/proximity/srf08.c | 1 -
drivers/iio/proximity/sx9500.c | 2 -
drivers/iio/temperature/hid-sensor-temperature.c | 1 -
drivers/iio/temperature/maxim_thermocouple.c | 1 -
drivers/iio/temperature/mlx90614.c | 1 -
drivers/iio/temperature/tmp006.c | 1 -
drivers/iio/temperature/tmp007.c | 1 -
drivers/iio/temperature/tsys01.c | 1 -
drivers/iio/temperature/tsys02d.c | 1 -
drivers/iio/trigger/iio-trig-hrtimer.c | 1 -
drivers/iio/trigger/iio-trig-interrupt.c | 1 -
drivers/iio/trigger/iio-trig-loop.c | 1 -
drivers/iio/trigger/iio-trig-sysfs.c | 1 -
drivers/iio/trigger/stm32-timer-trigger.c | 2 -
drivers/input/touchscreen/tsc2007_iio.c | 1 -
drivers/platform/x86/toshiba_acpi.c | 1 -
drivers/staging/iio/accel/adis16201.c | 1 -
drivers/staging/iio/accel/adis16203.c | 1 -
drivers/staging/iio/accel/adis16209.c | 1 -
drivers/staging/iio/accel/adis16240.c | 1 -
drivers/staging/iio/adc/ad7192.c | 2 -
drivers/staging/iio/adc/ad7280a.c | 1 -
drivers/staging/iio/adc/ad7606.c | 4 -
drivers/staging/iio/adc/ad7780.c | 1 -
drivers/staging/iio/adc/ad7816.c | 1 -
drivers/staging/iio/addac/adt7316.c | 2 -
drivers/staging/iio/cdc/ad7150.c | 1 -
drivers/staging/iio/cdc/ad7152.c | 1 -
drivers/staging/iio/cdc/ad7746.c | 1 -
drivers/staging/iio/frequency/ad9832.c | 1 -
drivers/staging/iio/frequency/ad9834.c | 2 -
drivers/staging/iio/gyro/adis16060_core.c | 1 -
drivers/staging/iio/impedance-analyzer/ad5933.c | 1 -
drivers/staging/iio/light/tsl2x7x.c | 5 --
drivers/staging/iio/meter/ade7753.c | 1 -
drivers/staging/iio/meter/ade7754.c | 1 -
drivers/staging/iio/meter/ade7758_core.c | 1 -
drivers/staging/iio/meter/ade7758_trigger.c | 1 -
drivers/staging/iio/meter/ade7759.c | 1 -
drivers/staging/iio/meter/ade7854.c | 1 -
drivers/staging/iio/resolver/ad2s1200.c | 1 -
drivers/staging/iio/resolver/ad2s1210.c | 1 -
drivers/staging/iio/resolver/ad2s90.c | 1 -
drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 1 -
include/linux/iio/iio.h | 34 ++++++--
include/linux/iio/trigger.h | 20 +++--
scripts/coccinelle/api/iio_no_owner.cocci | 94 ++++++++++++++++++++++
282 files changed, 160 insertions(+), 380 deletions(-)
create mode 100644 scripts/coccinelle/api/iio_no_owner.cocci
--
2.13.0
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH 01/38] iio: Use macro magic to avoid manual assign of driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-06-03 8:37 ` Jonathan Cameron
2017-06-12 16:13 ` Lars-Peter Clausen
2017-05-29 15:51 ` [PATCH 02/38] iio: triggers: Use macros to avoid boilerplate assignment of owner Jonathan Cameron
` (36 subsequent siblings)
37 siblings, 2 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
Starting point in boiler plate reduction similar to that done for
many similar cases elsewhere in the kernel.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/industrialio-core.c | 35 +++++++++--------------------------
drivers/iio/industrialio-trigger.c | 6 +++---
include/linux/iio/iio.h | 31 +++++++++++++++++++++++++++++--
3 files changed, 41 insertions(+), 31 deletions(-)
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 4a1de59d153a..62dafa4414e3 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -1665,14 +1665,11 @@ static int iio_check_unique_scan_index(struct iio_dev *indio_dev)
static const struct iio_buffer_setup_ops noop_ring_setup_ops;
-/**
- * iio_device_register() - register a device with the IIO subsystem
- * @indio_dev: Device structure filled by the device driver
- **/
-int iio_device_register(struct iio_dev *indio_dev)
+int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod)
{
int ret;
+ indio_dev->driver_module = this_mod;
/* If the calling driver did not initialize of_node, do it here */
if (!indio_dev->dev.of_node && indio_dev->dev.parent)
indio_dev->dev.of_node = indio_dev->dev.parent->of_node;
@@ -1718,7 +1715,8 @@ int iio_device_register(struct iio_dev *indio_dev)
indio_dev->setup_ops = &noop_ring_setup_ops;
cdev_init(&indio_dev->chrdev, &iio_buffer_fileops);
- indio_dev->chrdev.owner = indio_dev->info->driver_module;
+
+ indio_dev->chrdev.owner = this_mod;
ret = cdev_device_add(&indio_dev->chrdev, &indio_dev->dev);
if (ret < 0)
@@ -1736,7 +1734,7 @@ int iio_device_register(struct iio_dev *indio_dev)
iio_device_unregister_debugfs(indio_dev);
return ret;
}
-EXPORT_SYMBOL(iio_device_register);
+EXPORT_SYMBOL(__iio_device_register);
/**
* iio_device_unregister() - unregister a device from the IIO subsystem
@@ -1768,23 +1766,8 @@ static void devm_iio_device_unreg(struct device *dev, void *res)
iio_device_unregister(*(struct iio_dev **)res);
}
-/**
- * devm_iio_device_register - Resource-managed iio_device_register()
- * @dev: Device to allocate iio_dev for
- * @indio_dev: Device structure filled by the device driver
- *
- * Managed iio_device_register. The IIO device registered with this
- * function is automatically unregistered on driver detach. This function
- * calls iio_device_register() internally. Refer to that function for more
- * information.
- *
- * If an iio_dev registered with this function needs to be unregistered
- * separately, devm_iio_device_unregister() must be used.
- *
- * RETURNS:
- * 0 on success, negative error number on failure.
- */
-int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev)
+int __devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev,
+ struct module *this_mod)
{
struct iio_dev **ptr;
int ret;
@@ -1794,7 +1777,7 @@ int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev)
return -ENOMEM;
*ptr = indio_dev;
- ret = iio_device_register(indio_dev);
+ ret = __iio_device_register(indio_dev, this_mod);
if (!ret)
devres_add(dev, ptr);
else
@@ -1802,7 +1785,7 @@ int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev)
return ret;
}
-EXPORT_SYMBOL_GPL(devm_iio_device_register);
+EXPORT_SYMBOL_GPL(__devm_iio_device_register);
/**
* devm_iio_device_unregister - Resource-managed iio_device_unregister()
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 978e1592c2a3..067e58863592 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -250,7 +250,7 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
= bitmap_empty(trig->pool, CONFIG_IIO_CONSUMERS_PER_TRIGGER);
/* Prevent the module from being removed whilst attached to a trigger */
- __module_get(pf->indio_dev->info->driver_module);
+ __module_get(pf->indio_dev->driver_module);
/* Get irq number */
pf->irq = iio_trigger_get_irq(trig);
@@ -286,7 +286,7 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
out_put_irq:
iio_trigger_put_irq(trig, pf->irq);
out_put_module:
- module_put(pf->indio_dev->info->driver_module);
+ module_put(pf->indio_dev->driver_module);
return ret;
}
@@ -307,7 +307,7 @@ static int iio_trigger_detach_poll_func(struct iio_trigger *trig,
trig->attached_own_device = false;
iio_trigger_put_irq(trig, pf->irq);
free_irq(pf->irq, pf);
- module_put(pf->indio_dev->info->driver_module);
+ module_put(pf->indio_dev->driver_module);
return ret;
}
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 3f5ea2e9a39e..f65391067089 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -512,6 +512,7 @@ struct iio_buffer_setup_ops {
/**
* struct iio_dev - industrial I/O device
* @id: [INTERN] used to identify device internally
+ * @driver_module: [INTERN] used to make it harder to undercut users
* @modes: [DRIVER] operating modes supported by device
* @currentmode: [DRIVER] current operating mode
* @dev: [DRIVER] device structure, should be assigned a parent
@@ -552,6 +553,7 @@ struct iio_buffer_setup_ops {
*/
struct iio_dev {
int id;
+ struct module *driver_module;
int modes;
int currentmode;
@@ -598,9 +600,34 @@ struct iio_dev {
const struct iio_chan_spec
*iio_find_channel_from_si(struct iio_dev *indio_dev, int si);
-int iio_device_register(struct iio_dev *indio_dev);
+/**
+ * iio_device_register() - register a device with the IIO subsystem
+ * @indio_dev: Device structure filled by the device driver
+ **/
+#define iio_device_register(iio_dev) \
+ __iio_device_register(iio_dev, THIS_MODULE)
+int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod);
void iio_device_unregister(struct iio_dev *indio_dev);
-int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev);
+/**
+ * devm_iio_device_register - Resource-managed iio_device_register()
+ * @dev: Device to allocate iio_dev for
+ * @indio_dev: Device structure filled by the device driver
+ *
+ * Managed iio_device_register. The IIO device registered with this
+ * function is automatically unregistered on driver detach. This function
+ * calls iio_device_register() internally. Refer to that function for more
+ * information.
+ *
+ * If an iio_dev registered with this function needs to be unregistered
+ * separately, devm_iio_device_unregister() must be used.
+ *
+ * RETURNS:
+ * 0 on success, negative error number on failure.
+ */
+#define devm_iio_device_register(dev, indio_dev) \
+ __devm_iio_device_register(dev, indio_dev, THIS_MODULE);
+int __devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev,
+ struct module *this_mod);
void devm_iio_device_unregister(struct device *dev, struct iio_dev *indio_dev);
int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp);
int iio_device_claim_direct_mode(struct iio_dev *indio_dev);
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 02/38] iio: triggers: Use macros to avoid boilerplate assignment of owner.
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
2017-05-29 15:51 ` [PATCH 01/38] iio: Use macro magic to avoid manual assign of driver_module Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 03/38] coccinelle: Add an iio_no_owner semantic patch to drop driver_owner Jonathan Cameron
` (35 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
This trig_ops.owner assignment occurs in all trigger drivers and
can be simply automated using a macro as has been done in many
other places in the kernel.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/industrialio-trigger.c | 18 ++++++++++++------
include/linux/iio/trigger.h | 19 +++++++++++++------
2 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 067e58863592..6863ed5a61da 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -66,10 +66,13 @@ ATTRIBUTE_GROUPS(iio_trig_dev);
static struct iio_trigger *__iio_trigger_find_by_name(const char *name);
-int iio_trigger_register(struct iio_trigger *trig_info)
+int __iio_trigger_register(struct iio_trigger *trig_info,
+ struct module *this_mod)
{
int ret;
+ trig_info->owner = this_mod;
+
/* trig_info->ops is required for the module member */
if (!trig_info->ops)
return -EINVAL;
@@ -105,7 +108,7 @@ int iio_trigger_register(struct iio_trigger *trig_info)
ida_simple_remove(&iio_trigger_ida, trig_info->id);
return ret;
}
-EXPORT_SYMBOL(iio_trigger_register);
+EXPORT_SYMBOL(__iio_trigger_register);
void iio_trigger_unregister(struct iio_trigger *trig_info)
{
@@ -662,9 +665,10 @@ static void devm_iio_trigger_unreg(struct device *dev, void *res)
}
/**
- * devm_iio_trigger_register - Resource-managed iio_trigger_register()
+ * __devm_iio_trigger_register - Resource-managed iio_trigger_register()
* @dev: device this trigger was allocated for
* @trig_info: trigger to register
+ * @this_mod: module registering the trigger
*
* Managed iio_trigger_register(). The IIO trigger registered with this
* function is automatically unregistered on driver detach. This function
@@ -677,7 +681,9 @@ static void devm_iio_trigger_unreg(struct device *dev, void *res)
* RETURNS:
* 0 on success, negative error number on failure.
*/
-int devm_iio_trigger_register(struct device *dev, struct iio_trigger *trig_info)
+int __devm_iio_trigger_register(struct device *dev,
+ struct iio_trigger *trig_info,
+ struct module *this_mod)
{
struct iio_trigger **ptr;
int ret;
@@ -687,7 +693,7 @@ int devm_iio_trigger_register(struct device *dev, struct iio_trigger *trig_info)
return -ENOMEM;
*ptr = trig_info;
- ret = iio_trigger_register(trig_info);
+ ret = __iio_trigger_register(trig_info, this_mod);
if (!ret)
devres_add(dev, ptr);
else
@@ -695,7 +701,7 @@ int devm_iio_trigger_register(struct device *dev, struct iio_trigger *trig_info)
return ret;
}
-EXPORT_SYMBOL_GPL(devm_iio_trigger_register);
+EXPORT_SYMBOL_GPL(__devm_iio_trigger_register);
/**
* devm_iio_trigger_unregister - Resource-managed iio_trigger_unregister()
diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
index ea08302f2d7b..2e1800ad265b 100644
--- a/include/linux/iio/trigger.h
+++ b/include/linux/iio/trigger.h
@@ -62,6 +62,7 @@ struct iio_trigger_ops {
**/
struct iio_trigger {
const struct iio_trigger_ops *ops;
+ struct module *owner;
int id;
const char *name;
struct device dev;
@@ -87,14 +88,14 @@ static inline struct iio_trigger *to_iio_trigger(struct device *d)
static inline void iio_trigger_put(struct iio_trigger *trig)
{
- module_put(trig->ops->owner);
+ module_put(trig->owner);
put_device(&trig->dev);
}
static inline struct iio_trigger *iio_trigger_get(struct iio_trigger *trig)
{
get_device(&trig->dev);
- __module_get(trig->ops->owner);
+ __module_get(trig->owner);
return trig;
}
@@ -127,10 +128,16 @@ static inline void *iio_trigger_get_drvdata(struct iio_trigger *trig)
* iio_trigger_register() - register a trigger with the IIO core
* @trig_info: trigger to be registered
**/
-int iio_trigger_register(struct iio_trigger *trig_info);
-
-int devm_iio_trigger_register(struct device *dev,
- struct iio_trigger *trig_info);
+#define iio_trigger_register(trig_info) \
+ __iio_trigger_register(trig_info, THIS_MODULE)
+int __iio_trigger_register(struct iio_trigger *trig_info,
+ struct module *this_mod);
+
+#define devm_iio_trigger_register(dev, trig_info) \
+ __devm_iio_trigger_register(dev, trig_info, THIS_MODULE)
+int __devm_iio_trigger_register(struct device *dev,
+ struct iio_trigger *trig_info,
+ struct module *this_mod);
/**
* iio_trigger_unregister() - unregister a trigger from the core
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 03/38] coccinelle: Add an iio_no_owner semantic patch to drop driver_owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
2017-05-29 15:51 ` [PATCH 01/38] iio: Use macro magic to avoid manual assign of driver_module Jonathan Cameron
2017-05-29 15:51 ` [PATCH 02/38] iio: triggers: Use macros to avoid boilerplate assignment of owner Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 04/38] iio:adc: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
` (34 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
After some macro magic has made the core code assign this appropriately
the field isn't used. This patch automates the removal of the relevant
assignments.
Will be removed again once all instances have been dealt with and the field
is finally removed.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
scripts/coccinelle/api/iio_no_owner.cocci | 94 +++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
diff --git a/scripts/coccinelle/api/iio_no_owner.cocci b/scripts/coccinelle/api/iio_no_owner.cocci
new file mode 100644
index 000000000000..964854f1119a
--- /dev/null
+++ b/scripts/coccinelle/api/iio_no_owner.cocci
@@ -0,0 +1,94 @@
+/// Remove .owner field if calls are used which set it automatically
+///
+// Confidence: High
+// Copyright : (C) 2017 Jonathan Cmeron. GPLv2.
+// Loosely based on platform_no_drv_owner.smpl
+// Copyright: (C) 2014 Wolfram Sang. GPL v2.
+
+virtual patch
+virtual context
+virtual org
+virtual report
+
+@match1@
+identifier I;
+expression E;
+@@
+static struct iio_info I = {
+ .driver_module = E,
+};
+
+@fix1 depends on match1 && patch && !context && !org && !report@
+identifier match1.I;
+@@
+static struct iio_info I = {
+- .driver_module = THIS_MODULE,
+};
+
+@match2@
+identifier O;
+expression E;
+@@
+static struct iio_trigger_ops O = {
+ .owner = E,
+};
+
+@fix2 depends on match2 && patch && !context && !org && !report@
+identifier match2.O;
+@@
+static struct iio_trigger_ops O = {
+- .owner = THIS_MODULE,
+};
+
+// ----------------------------------------------------------------------------
+
+@fix1_context depends on match1 && !patch && (context || org || report)@
+identifier match1.I;
+position j0;
+@@
+
+ static struct iio_info I = {
+* .driver_module@j0 = THIS_MODULE,
+ };
+
+@fix2_context depends on match2 && !patch && (context || org || report)@
+identifier match2.O;
+position j0;
+@@
+
+ static struct iio_trigger_ops O = {
+* .owner@j0 = THIS_MODULE,
+ };
+
+
+// ----------------------------------------------------------------------------
+
+@script:python fix1_org depends on org@
+j0 << fix1_context.j0;
+@@
+
+msg = "Setting .driver_module here is deprecated and soon to be removed."
+coccilib.org.print_todo(j0[0], msg)
+
+@script:python fix2_org depends on org@
+j0 << fix2_context.j0;
+@@
+
+msg = "Setting .owner here is deprecated and soon to be removed."
+coccilib.org.print_todo(j0[0], msg)
+
+// ----------------------------------------------------------------------------
+
+@script:python fix1_report depends on report@
+j0 << fix1_context.j0;
+@@
+
+msg = "Setting .driver_module here is deprecated and soon to be removed."
+coccilib.report.print_report(j0[0], msg)
+
+@script:python fix2_report depends on report@
+j0 << fix2_context.j0;
+@@
+
+msg = "Setting .owner here is deprecated and soon to be removed."
+coccilib.report.print_report(j0[0], msg)
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 04/38] iio:adc: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (2 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 03/38] coccinelle: Add an iio_no_owner semantic patch to drop driver_owner Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 05/38] iio:accel: " Jonathan Cameron
` (33 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/adc/ad7266.c | 1 -
drivers/iio/adc/ad7291.c | 1 -
drivers/iio/adc/ad7298.c | 1 -
drivers/iio/adc/ad7476.c | 1 -
drivers/iio/adc/ad7766.c | 2 --
drivers/iio/adc/ad7791.c | 2 --
drivers/iio/adc/ad7793.c | 2 --
drivers/iio/adc/ad7887.c | 1 -
drivers/iio/adc/ad7923.c | 1 -
drivers/iio/adc/ad799x.c | 3 ---
drivers/iio/adc/ad_sigma_delta.c | 1 -
drivers/iio/adc/aspeed_adc.c | 1 -
drivers/iio/adc/at91-sama5d2_adc.c | 1 -
drivers/iio/adc/at91_adc.c | 2 --
drivers/iio/adc/axp288_adc.c | 1 -
drivers/iio/adc/bcm_iproc_adc.c | 1 -
drivers/iio/adc/berlin2-adc.c | 1 -
drivers/iio/adc/cc10001_adc.c | 1 -
drivers/iio/adc/cpcap-adc.c | 1 -
drivers/iio/adc/da9150-gpadc.c | 1 -
drivers/iio/adc/envelope-detector.c | 1 -
drivers/iio/adc/exynos_adc.c | 1 -
drivers/iio/adc/hi8435.c | 1 -
drivers/iio/adc/hx711.c | 1 -
drivers/iio/adc/imx7d_adc.c | 1 -
drivers/iio/adc/ina2xx-adc.c | 1 -
drivers/iio/adc/lp8788_adc.c | 1 -
drivers/iio/adc/lpc18xx_adc.c | 1 -
drivers/iio/adc/lpc32xx_adc.c | 1 -
drivers/iio/adc/ltc2485.c | 1 -
drivers/iio/adc/ltc2497.c | 1 -
drivers/iio/adc/max1027.c | 2 --
drivers/iio/adc/max11100.c | 1 -
drivers/iio/adc/max1118.c | 1 -
drivers/iio/adc/max1363.c | 2 --
drivers/iio/adc/max9611.c | 1 -
drivers/iio/adc/mcp320x.c | 1 -
drivers/iio/adc/mcp3422.c | 1 -
drivers/iio/adc/men_z188_adc.c | 1 -
drivers/iio/adc/meson_saradc.c | 1 -
drivers/iio/adc/mt6577_auxadc.c | 1 -
drivers/iio/adc/mxs-lradc-adc.c | 2 --
drivers/iio/adc/nau7802.c | 1 -
drivers/iio/adc/palmas_gpadc.c | 1 -
drivers/iio/adc/qcom-pm8xxx-xoadc.c | 1 -
drivers/iio/adc/qcom-spmi-iadc.c | 1 -
drivers/iio/adc/qcom-spmi-vadc.c | 1 -
drivers/iio/adc/rcar-gyroadc.c | 1 -
drivers/iio/adc/rockchip_saradc.c | 1 -
drivers/iio/adc/spear_adc.c | 1 -
drivers/iio/adc/stm32-adc.c | 1 -
drivers/iio/adc/stx104.c | 1 -
drivers/iio/adc/sun4i-gpadc-iio.c | 1 -
drivers/iio/adc/ti-adc081c.c | 1 -
drivers/iio/adc/ti-adc0832.c | 1 -
drivers/iio/adc/ti-adc084s021.c | 1 -
drivers/iio/adc/ti-adc108s102.c | 1 -
drivers/iio/adc/ti-adc12138.c | 1 -
drivers/iio/adc/ti-adc128s052.c | 1 -
drivers/iio/adc/ti-adc161s626.c | 1 -
drivers/iio/adc/ti-ads1015.c | 2 --
drivers/iio/adc/ti-ads7950.c | 1 -
drivers/iio/adc/ti-ads8688.c | 1 -
drivers/iio/adc/ti-tlc4541.c | 1 -
drivers/iio/adc/ti_am335x_adc.c | 1 -
drivers/iio/adc/twl4030-madc.c | 1 -
drivers/iio/adc/twl6030-gpadc.c | 1 -
drivers/iio/adc/vf610_adc.c | 1 -
drivers/iio/adc/viperboard_adc.c | 1 -
drivers/iio/adc/xilinx-xadc-core.c | 2 --
70 files changed, 81 deletions(-)
diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index b8d5cfd57ec4..605eb5e7e829 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -280,7 +280,6 @@ static AD7266_DECLARE_DIFF_CHANNELS_FIXED(u, 'u');
static const struct iio_info ad7266_info = {
.read_raw = &ad7266_read_raw,
.update_scan_mode = &ad7266_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static const unsigned long ad7266_available_scan_masks[] = {
diff --git a/drivers/iio/adc/ad7291.c b/drivers/iio/adc/ad7291.c
index 1d90b02732bb..a862b5d8fb4b 100644
--- a/drivers/iio/adc/ad7291.c
+++ b/drivers/iio/adc/ad7291.c
@@ -461,7 +461,6 @@ static const struct iio_info ad7291_info = {
.write_event_config = &ad7291_write_event_config,
.read_event_value = &ad7291_read_event_value,
.write_event_value = &ad7291_write_event_value,
- .driver_module = THIS_MODULE,
};
static int ad7291_probe(struct i2c_client *client,
diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c
index e399bf04c73a..2b20c6c8ec7f 100644
--- a/drivers/iio/adc/ad7298.c
+++ b/drivers/iio/adc/ad7298.c
@@ -280,7 +280,6 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
static const struct iio_info ad7298_info = {
.read_raw = &ad7298_read_raw,
.update_scan_mode = ad7298_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static int ad7298_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ad7476.c b/drivers/iio/adc/ad7476.c
index b7ecf9aab90f..b7706bf10ffe 100644
--- a/drivers/iio/adc/ad7476.c
+++ b/drivers/iio/adc/ad7476.c
@@ -195,7 +195,6 @@ static const struct ad7476_chip_info ad7476_chip_info_tbl[] = {
};
static const struct iio_info ad7476_info = {
- .driver_module = THIS_MODULE,
.read_raw = &ad7476_read_raw,
};
diff --git a/drivers/iio/adc/ad7766.c b/drivers/iio/adc/ad7766.c
index 75cca42b6e70..0135687bc7eb 100644
--- a/drivers/iio/adc/ad7766.c
+++ b/drivers/iio/adc/ad7766.c
@@ -187,7 +187,6 @@ static const struct iio_buffer_setup_ops ad7766_buffer_setup_ops = {
};
static const struct iio_info ad7766_info = {
- .driver_module = THIS_MODULE,
.read_raw = &ad7766_read_raw,
};
@@ -210,7 +209,6 @@ static int ad7766_set_trigger_state(struct iio_trigger *trig, bool enable)
}
static const struct iio_trigger_ops ad7766_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = ad7766_set_trigger_state,
.validate_device = iio_trigger_validate_own_device,
};
diff --git a/drivers/iio/adc/ad7791.c b/drivers/iio/adc/ad7791.c
index 1817ebf5ad84..ec7cf2293879 100644
--- a/drivers/iio/adc/ad7791.c
+++ b/drivers/iio/adc/ad7791.c
@@ -310,13 +310,11 @@ static const struct iio_info ad7791_info = {
.read_raw = &ad7791_read_raw,
.attrs = &ad7791_attribute_group,
.validate_trigger = ad_sd_validate_trigger,
- .driver_module = THIS_MODULE,
};
static const struct iio_info ad7791_no_filter_info = {
.read_raw = &ad7791_read_raw,
.validate_trigger = ad_sd_validate_trigger,
- .driver_module = THIS_MODULE,
};
static int ad7791_setup(struct ad7791_state *st,
diff --git a/drivers/iio/adc/ad7793.c b/drivers/iio/adc/ad7793.c
index e6706a09e100..c40263ad881f 100644
--- a/drivers/iio/adc/ad7793.c
+++ b/drivers/iio/adc/ad7793.c
@@ -563,7 +563,6 @@ static const struct iio_info ad7793_info = {
.write_raw_get_fmt = &ad7793_write_raw_get_fmt,
.attrs = &ad7793_attribute_group,
.validate_trigger = ad_sd_validate_trigger,
- .driver_module = THIS_MODULE,
};
static const struct iio_info ad7797_info = {
@@ -572,7 +571,6 @@ static const struct iio_info ad7797_info = {
.write_raw_get_fmt = &ad7793_write_raw_get_fmt,
.attrs = &ad7793_attribute_group,
.validate_trigger = ad_sd_validate_trigger,
- .driver_module = THIS_MODULE,
};
#define DECLARE_AD7793_CHANNELS(_name, _b, _sb, _s) \
diff --git a/drivers/iio/adc/ad7887.c b/drivers/iio/adc/ad7887.c
index 7a483bfbd70c..205c0f1761aa 100644
--- a/drivers/iio/adc/ad7887.c
+++ b/drivers/iio/adc/ad7887.c
@@ -229,7 +229,6 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = {
static const struct iio_info ad7887_info = {
.read_raw = &ad7887_read_raw,
- .driver_module = THIS_MODULE,
};
static int ad7887_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ad7923.c b/drivers/iio/adc/ad7923.c
index 77a675e11ebb..ffb7e089969c 100644
--- a/drivers/iio/adc/ad7923.c
+++ b/drivers/iio/adc/ad7923.c
@@ -262,7 +262,6 @@ static int ad7923_read_raw(struct iio_dev *indio_dev,
static const struct iio_info ad7923_info = {
.read_raw = &ad7923_read_raw,
.update_scan_mode = ad7923_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static int ad7923_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c
index 22426ae4af97..e1da67d5ee22 100644
--- a/drivers/iio/adc/ad799x.c
+++ b/drivers/iio/adc/ad799x.c
@@ -526,13 +526,11 @@ static const struct attribute_group ad799x_event_attrs_group = {
static const struct iio_info ad7991_info = {
.read_raw = &ad799x_read_raw,
- .driver_module = THIS_MODULE,
.update_scan_mode = ad799x_update_scan_mode,
};
static const struct iio_info ad7993_4_7_8_noirq_info = {
.read_raw = &ad799x_read_raw,
- .driver_module = THIS_MODULE,
.update_scan_mode = ad799x_update_scan_mode,
};
@@ -543,7 +541,6 @@ static const struct iio_info ad7993_4_7_8_irq_info = {
.write_event_config = &ad799x_write_event_config,
.read_event_value = &ad799x_read_event_value,
.write_event_value = &ad799x_write_event_value,
- .driver_module = THIS_MODULE,
.update_scan_mode = ad799x_update_scan_mode,
};
diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
index d10bd0c97233..e3ed74ee41d1 100644
--- a/drivers/iio/adc/ad_sigma_delta.c
+++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -435,7 +435,6 @@ int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig)
EXPORT_SYMBOL_GPL(ad_sd_validate_trigger);
static const struct iio_trigger_ops ad_sd_trigger_ops = {
- .owner = THIS_MODULE,
};
static int ad_sd_probe_trigger(struct iio_dev *indio_dev)
diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c
index 62670cbfa2bb..238c8f5a2118 100644
--- a/drivers/iio/adc/aspeed_adc.c
+++ b/drivers/iio/adc/aspeed_adc.c
@@ -158,7 +158,6 @@ static int aspeed_adc_reg_access(struct iio_dev *indio_dev,
}
static const struct iio_info aspeed_adc_iio_info = {
- .driver_module = THIS_MODULE,
.read_raw = aspeed_adc_read_raw,
.write_raw = aspeed_adc_write_raw,
.debugfs_reg_access = aspeed_adc_reg_access,
diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index e10dca3ed74b..d148d8fd372b 100644
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -383,7 +383,6 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev,
static const struct iio_info at91_adc_info = {
.read_raw = &at91_adc_read_raw,
.write_raw = &at91_adc_write_raw,
- .driver_module = THIS_MODULE,
};
static int at91_adc_probe(struct platform_device *pdev)
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 34b928cefeed..7cf5a77f5d66 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -594,7 +594,6 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
}
static const struct iio_trigger_ops at91_adc_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = &at91_adc_configure_trigger,
};
@@ -976,7 +975,6 @@ static int at91_adc_probe_pdata(struct at91_adc_state *st,
}
static const struct iio_info at91_adc_info = {
- .driver_module = THIS_MODULE,
.read_raw = &at91_adc_read_raw,
};
diff --git a/drivers/iio/adc/axp288_adc.c b/drivers/iio/adc/axp288_adc.c
index 64799ad7ebad..bc9fd54868f2 100644
--- a/drivers/iio/adc/axp288_adc.c
+++ b/drivers/iio/adc/axp288_adc.c
@@ -143,7 +143,6 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev,
static const struct iio_info axp288_adc_iio_info = {
.read_raw = &axp288_adc_read_raw,
- .driver_module = THIS_MODULE,
};
static int axp288_adc_probe(struct platform_device *pdev)
diff --git a/drivers/iio/adc/bcm_iproc_adc.c b/drivers/iio/adc/bcm_iproc_adc.c
index 21d38c8af21e..7094550df43e 100644
--- a/drivers/iio/adc/bcm_iproc_adc.c
+++ b/drivers/iio/adc/bcm_iproc_adc.c
@@ -492,7 +492,6 @@ static int iproc_adc_read_raw(struct iio_dev *indio_dev,
static const struct iio_info iproc_adc_iio_info = {
.read_raw = &iproc_adc_read_raw,
- .driver_module = THIS_MODULE,
};
#define IPROC_ADC_CHANNEL(_index, _id) { \
diff --git a/drivers/iio/adc/berlin2-adc.c b/drivers/iio/adc/berlin2-adc.c
index 71c806ecc722..72d8fa94ab31 100644
--- a/drivers/iio/adc/berlin2-adc.c
+++ b/drivers/iio/adc/berlin2-adc.c
@@ -277,7 +277,6 @@ static irqreturn_t berlin2_adc_tsen_irq(int irq, void *private)
}
static const struct iio_info berlin2_adc_info = {
- .driver_module = THIS_MODULE,
.read_raw = berlin2_adc_read_raw,
};
diff --git a/drivers/iio/adc/cc10001_adc.c b/drivers/iio/adc/cc10001_adc.c
index 91636c0ba5b5..707d8b24b072 100644
--- a/drivers/iio/adc/cc10001_adc.c
+++ b/drivers/iio/adc/cc10001_adc.c
@@ -262,7 +262,6 @@ static int cc10001_update_scan_mode(struct iio_dev *indio_dev,
}
static const struct iio_info cc10001_adc_info = {
- .driver_module = THIS_MODULE,
.read_raw = &cc10001_adc_read_raw,
.update_scan_mode = &cc10001_update_scan_mode,
};
diff --git a/drivers/iio/adc/cpcap-adc.c b/drivers/iio/adc/cpcap-adc.c
index 6e419d5a7c14..3576ec73ec23 100644
--- a/drivers/iio/adc/cpcap-adc.c
+++ b/drivers/iio/adc/cpcap-adc.c
@@ -932,7 +932,6 @@ static int cpcap_adc_read(struct iio_dev *indio_dev,
static const struct iio_info cpcap_adc_info = {
.read_raw = &cpcap_adc_read,
- .driver_module = THIS_MODULE,
};
/*
diff --git a/drivers/iio/adc/da9150-gpadc.c b/drivers/iio/adc/da9150-gpadc.c
index 3445107e10b7..0a5d9ce79164 100644
--- a/drivers/iio/adc/da9150-gpadc.c
+++ b/drivers/iio/adc/da9150-gpadc.c
@@ -249,7 +249,6 @@ static int da9150_gpadc_read_raw(struct iio_dev *indio_dev,
static const struct iio_info da9150_gpadc_info = {
.read_raw = &da9150_gpadc_read_raw,
- .driver_module = THIS_MODULE,
};
#define DA9150_GPADC_CHANNEL(_id, _hw_id, _type, chan_info, \
diff --git a/drivers/iio/adc/envelope-detector.c b/drivers/iio/adc/envelope-detector.c
index fef15c0d7c9c..4ebda8ab54fe 100644
--- a/drivers/iio/adc/envelope-detector.c
+++ b/drivers/iio/adc/envelope-detector.c
@@ -322,7 +322,6 @@ static const struct iio_chan_spec envelope_detector_iio_channel = {
static const struct iio_info envelope_detector_info = {
.read_raw = &envelope_detector_read_raw,
- .driver_module = THIS_MODULE,
};
static int envelope_detector_probe(struct platform_device *pdev)
diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
index 6c5a7be9f8c1..f10443f92e4c 100644
--- a/drivers/iio/adc/exynos_adc.c
+++ b/drivers/iio/adc/exynos_adc.c
@@ -657,7 +657,6 @@ static int exynos_adc_reg_access(struct iio_dev *indio_dev,
static const struct iio_info exynos_adc_iio_info = {
.read_raw = &exynos_read_raw,
.debugfs_reg_access = &exynos_adc_reg_access,
- .driver_module = THIS_MODULE,
};
#define ADC_CHANNEL(_index, _id) { \
diff --git a/drivers/iio/adc/hi8435.c b/drivers/iio/adc/hi8435.c
index adf7dc712937..6f6c9a348158 100644
--- a/drivers/iio/adc/hi8435.c
+++ b/drivers/iio/adc/hi8435.c
@@ -408,7 +408,6 @@ static const struct iio_chan_spec hi8435_channels[] = {
};
static const struct iio_info hi8435_info = {
- .driver_module = THIS_MODULE,
.read_raw = hi8435_read_raw,
.read_event_config = hi8435_read_event_config,
.write_event_config = hi8435_write_event_config,
diff --git a/drivers/iio/adc/hx711.c b/drivers/iio/adc/hx711.c
index 27005d84ed73..d10b9f13d557 100644
--- a/drivers/iio/adc/hx711.c
+++ b/drivers/iio/adc/hx711.c
@@ -374,7 +374,6 @@ static const struct attribute_group hx711_attribute_group = {
};
static const struct iio_info hx711_iio_info = {
- .driver_module = THIS_MODULE,
.read_raw = hx711_read_raw,
.write_raw = hx711_write_raw,
.write_raw_get_fmt = hx711_write_raw_get_fmt,
diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c
index 254b29a68b9d..cfab31162845 100644
--- a/drivers/iio/adc/imx7d_adc.c
+++ b/drivers/iio/adc/imx7d_adc.c
@@ -412,7 +412,6 @@ static int imx7d_adc_reg_access(struct iio_dev *indio_dev,
}
static const struct iio_info imx7d_adc_iio_info = {
- .driver_module = THIS_MODULE,
.read_raw = &imx7d_adc_read_raw,
.debugfs_reg_access = &imx7d_adc_reg_access,
};
diff --git a/drivers/iio/adc/ina2xx-adc.c b/drivers/iio/adc/ina2xx-adc.c
index bba10a1b2fcb..ade84a65bbcd 100644
--- a/drivers/iio/adc/ina2xx-adc.c
+++ b/drivers/iio/adc/ina2xx-adc.c
@@ -614,7 +614,6 @@ static const struct attribute_group ina2xx_attribute_group = {
};
static const struct iio_info ina2xx_info = {
- .driver_module = THIS_MODULE,
.attrs = &ina2xx_attribute_group,
.read_raw = ina2xx_read_raw,
.write_raw = ina2xx_write_raw,
diff --git a/drivers/iio/adc/lp8788_adc.c b/drivers/iio/adc/lp8788_adc.c
index 152cfc8e1c7b..3bc4df916420 100644
--- a/drivers/iio/adc/lp8788_adc.c
+++ b/drivers/iio/adc/lp8788_adc.c
@@ -125,7 +125,6 @@ static int lp8788_adc_read_raw(struct iio_dev *indio_dev,
static const struct iio_info lp8788_adc_info = {
.read_raw = &lp8788_adc_read_raw,
- .driver_module = THIS_MODULE,
};
#define LP8788_CHAN(_id, _type) { \
diff --git a/drivers/iio/adc/lpc18xx_adc.c b/drivers/iio/adc/lpc18xx_adc.c
index 3ef18f4b27f0..041dc4a3f66c 100644
--- a/drivers/iio/adc/lpc18xx_adc.c
+++ b/drivers/iio/adc/lpc18xx_adc.c
@@ -116,7 +116,6 @@ static int lpc18xx_adc_read_raw(struct iio_dev *indio_dev,
static const struct iio_info lpc18xx_adc_info = {
.read_raw = lpc18xx_adc_read_raw,
- .driver_module = THIS_MODULE,
};
static int lpc18xx_adc_probe(struct platform_device *pdev)
diff --git a/drivers/iio/adc/lpc32xx_adc.c b/drivers/iio/adc/lpc32xx_adc.c
index 0de709b4288b..f578b3e5b2b3 100644
--- a/drivers/iio/adc/lpc32xx_adc.c
+++ b/drivers/iio/adc/lpc32xx_adc.c
@@ -100,7 +100,6 @@ static int lpc32xx_read_raw(struct iio_dev *indio_dev,
static const struct iio_info lpc32xx_adc_iio_info = {
.read_raw = &lpc32xx_read_raw,
- .driver_module = THIS_MODULE,
};
#define LPC32XX_ADC_CHANNEL(_index) { \
diff --git a/drivers/iio/adc/ltc2485.c b/drivers/iio/adc/ltc2485.c
index eab91f12454a..b24c14037fd4 100644
--- a/drivers/iio/adc/ltc2485.c
+++ b/drivers/iio/adc/ltc2485.c
@@ -90,7 +90,6 @@ static const struct iio_chan_spec ltc2485_channel[] = {
static const struct iio_info ltc2485_info = {
.read_raw = ltc2485_read_raw,
- .driver_module = THIS_MODULE,
};
static int ltc2485_probe(struct i2c_client *client,
diff --git a/drivers/iio/adc/ltc2497.c b/drivers/iio/adc/ltc2497.c
index 2691b10023f5..46d33fa2f9d8 100644
--- a/drivers/iio/adc/ltc2497.c
+++ b/drivers/iio/adc/ltc2497.c
@@ -184,7 +184,6 @@ static const struct iio_chan_spec ltc2497_channel[] = {
static const struct iio_info ltc2497_info = {
.read_raw = ltc2497_read_raw,
- .driver_module = THIS_MODULE,
};
static int ltc2497_probe(struct i2c_client *client,
diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c
index ebc715927e63..375da6491499 100644
--- a/drivers/iio/adc/max1027.c
+++ b/drivers/iio/adc/max1027.c
@@ -381,13 +381,11 @@ static irqreturn_t max1027_trigger_handler(int irq, void *private)
}
static const struct iio_trigger_ops max1027_trigger_ops = {
- .owner = THIS_MODULE,
.validate_device = &iio_trigger_validate_own_device,
.set_trigger_state = &max1027_set_trigger_state,
};
static const struct iio_info max1027_info = {
- .driver_module = THIS_MODULE,
.read_raw = &max1027_read_raw,
.validate_trigger = &max1027_validate_trigger,
.debugfs_reg_access = &max1027_debugfs_reg_access,
diff --git a/drivers/iio/adc/max11100.c b/drivers/iio/adc/max11100.c
index 1180bcc22ff1..af59ab2e650c 100644
--- a/drivers/iio/adc/max11100.c
+++ b/drivers/iio/adc/max11100.c
@@ -100,7 +100,6 @@ static int max11100_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info max11100_info = {
- .driver_module = THIS_MODULE,
.read_raw = max11100_read_raw,
};
diff --git a/drivers/iio/adc/max1118.c b/drivers/iio/adc/max1118.c
index 2e9648a078c4..49db9e9ae625 100644
--- a/drivers/iio/adc/max1118.c
+++ b/drivers/iio/adc/max1118.c
@@ -155,7 +155,6 @@ static int max1118_read_raw(struct iio_dev *indio_dev,
static const struct iio_info max1118_info = {
.read_raw = max1118_read_raw,
- .driver_module = THIS_MODULE,
};
static irqreturn_t max1118_trigger_handler(int irq, void *p)
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index 80eada4886b3..7f1848dac9bf 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -1029,7 +1029,6 @@ static int max1363_update_scan_mode(struct iio_dev *indio_dev,
static const struct iio_info max1238_info = {
.read_raw = &max1363_read_raw,
- .driver_module = THIS_MODULE,
.update_scan_mode = &max1363_update_scan_mode,
};
@@ -1040,7 +1039,6 @@ static const struct iio_info max1363_info = {
.write_event_config = &max1363_write_event_config,
.read_raw = &max1363_read_raw,
.update_scan_mode = &max1363_update_scan_mode,
- .driver_module = THIS_MODULE,
.event_attrs = &max1363_event_attribute_group,
};
diff --git a/drivers/iio/adc/max9611.c b/drivers/iio/adc/max9611.c
index ec82106480e1..fbc8aaae0a68 100644
--- a/drivers/iio/adc/max9611.c
+++ b/drivers/iio/adc/max9611.c
@@ -460,7 +460,6 @@ static const struct attribute_group max9611_attribute_group = {
};
static const struct iio_info indio_info = {
- .driver_module = THIS_MODULE,
.read_raw = max9611_read_raw,
.attrs = &max9611_attribute_group,
};
diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
index 634717ae12f3..06bc2453caf9 100644
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@ -242,7 +242,6 @@ static const struct iio_chan_spec mcp3208_channels[] = {
static const struct iio_info mcp320x_info = {
.read_raw = mcp320x_read_raw,
- .driver_module = THIS_MODULE,
};
static const struct mcp320x_chip_info mcp320x_chip_infos[] = {
diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
index 254135e07792..9233cffabd67 100644
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
@@ -327,7 +327,6 @@ static const struct iio_info mcp3422_info = {
.write_raw = mcp3422_write_raw,
.write_raw_get_fmt = mcp3422_write_raw_get_fmt,
.attrs = &mcp3422_attribute_group,
- .driver_module = THIS_MODULE,
};
static int mcp3422_probe(struct i2c_client *client,
diff --git a/drivers/iio/adc/men_z188_adc.c b/drivers/iio/adc/men_z188_adc.c
index 8f3606de4eaf..c80261748d8f 100644
--- a/drivers/iio/adc/men_z188_adc.c
+++ b/drivers/iio/adc/men_z188_adc.c
@@ -80,7 +80,6 @@ static int z188_iio_read_raw(struct iio_dev *iio_dev,
static const struct iio_info z188_adc_info = {
.read_raw = &z188_iio_read_raw,
- .driver_module = THIS_MODULE,
};
static void men_z188_config_channels(void __iomem *addr)
diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c
index 81cd39a57fe3..f537a53b2011 100644
--- a/drivers/iio/adc/meson_saradc.c
+++ b/drivers/iio/adc/meson_saradc.c
@@ -840,7 +840,6 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev)
static const struct iio_info meson_sar_adc_iio_info = {
.read_raw = meson_sar_adc_iio_info_read_raw,
- .driver_module = THIS_MODULE,
};
static const struct meson_sar_adc_data meson_sar_adc_meson8_data = {
diff --git a/drivers/iio/adc/mt6577_auxadc.c b/drivers/iio/adc/mt6577_auxadc.c
index 2d104c828041..f7384828fb5c 100644
--- a/drivers/iio/adc/mt6577_auxadc.c
+++ b/drivers/iio/adc/mt6577_auxadc.c
@@ -180,7 +180,6 @@ static int mt6577_auxadc_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info mt6577_auxadc_info = {
- .driver_module = THIS_MODULE,
.read_raw = &mt6577_auxadc_read_raw,
};
diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
index b0c7d8ee5cb8..102898b6e3b3 100644
--- a/drivers/iio/adc/mxs-lradc-adc.c
+++ b/drivers/iio/adc/mxs-lradc-adc.c
@@ -382,7 +382,6 @@ static const struct attribute_group mxs_lradc_adc_attribute_group = {
};
static const struct iio_info mxs_lradc_adc_iio_info = {
- .driver_module = THIS_MODULE,
.read_raw = mxs_lradc_adc_read_raw,
.write_raw = mxs_lradc_adc_write_raw,
.write_raw_get_fmt = mxs_lradc_adc_write_raw_get_fmt,
@@ -455,7 +454,6 @@ static int mxs_lradc_adc_configure_trigger(struct iio_trigger *trig, bool state)
}
static const struct iio_trigger_ops mxs_lradc_adc_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = &mxs_lradc_adc_configure_trigger,
};
diff --git a/drivers/iio/adc/nau7802.c b/drivers/iio/adc/nau7802.c
index 08f446695f97..8997e74a8847 100644
--- a/drivers/iio/adc/nau7802.c
+++ b/drivers/iio/adc/nau7802.c
@@ -402,7 +402,6 @@ static int nau7802_write_raw_get_fmt(struct iio_dev *indio_dev,
}
static const struct iio_info nau7802_info = {
- .driver_module = THIS_MODULE,
.read_raw = &nau7802_read_raw,
.write_raw = &nau7802_write_raw,
.write_raw_get_fmt = nau7802_write_raw_get_fmt,
diff --git a/drivers/iio/adc/palmas_gpadc.c b/drivers/iio/adc/palmas_gpadc.c
index 7d61b566e148..69b9affeef1e 100644
--- a/drivers/iio/adc/palmas_gpadc.c
+++ b/drivers/iio/adc/palmas_gpadc.c
@@ -430,7 +430,6 @@ static int palmas_gpadc_read_raw(struct iio_dev *indio_dev,
static const struct iio_info palmas_gpadc_iio_info = {
.read_raw = palmas_gpadc_read_raw,
- .driver_module = THIS_MODULE,
};
#define PALMAS_ADC_CHAN_IIO(chan, _type, chan_info) \
diff --git a/drivers/iio/adc/qcom-pm8xxx-xoadc.c b/drivers/iio/adc/qcom-pm8xxx-xoadc.c
index cea8f1fb444a..b093ecddf1a8 100644
--- a/drivers/iio/adc/qcom-pm8xxx-xoadc.c
+++ b/drivers/iio/adc/qcom-pm8xxx-xoadc.c
@@ -728,7 +728,6 @@ static int pm8xxx_of_xlate(struct iio_dev *indio_dev,
}
static const struct iio_info pm8xxx_xoadc_info = {
- .driver_module = THIS_MODULE,
.of_xlate = pm8xxx_of_xlate,
.read_raw = pm8xxx_read_raw,
};
diff --git a/drivers/iio/adc/qcom-spmi-iadc.c b/drivers/iio/adc/qcom-spmi-iadc.c
index fabd24edc2a1..3f062cd61aba 100644
--- a/drivers/iio/adc/qcom-spmi-iadc.c
+++ b/drivers/iio/adc/qcom-spmi-iadc.c
@@ -356,7 +356,6 @@ static int iadc_read_raw(struct iio_dev *indio_dev,
static const struct iio_info iadc_info = {
.read_raw = iadc_read_raw,
- .driver_module = THIS_MODULE,
};
static irqreturn_t iadc_isr(int irq, void *dev_id)
diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c
index 9e600bfd1765..3680e0d47412 100644
--- a/drivers/iio/adc/qcom-spmi-vadc.c
+++ b/drivers/iio/adc/qcom-spmi-vadc.c
@@ -506,7 +506,6 @@ static int vadc_of_xlate(struct iio_dev *indio_dev,
static const struct iio_info vadc_info = {
.read_raw = vadc_read_raw,
.of_xlate = vadc_of_xlate,
- .driver_module = THIS_MODULE,
};
struct vadc_channels {
diff --git a/drivers/iio/adc/rcar-gyroadc.c b/drivers/iio/adc/rcar-gyroadc.c
index 27a318164619..2cb5397ceeea 100644
--- a/drivers/iio/adc/rcar-gyroadc.c
+++ b/drivers/iio/adc/rcar-gyroadc.c
@@ -277,7 +277,6 @@ static int rcar_gyroadc_reg_access(struct iio_dev *indio_dev,
}
static const struct iio_info rcar_gyroadc_iio_info = {
- .driver_module = THIS_MODULE,
.read_raw = rcar_gyroadc_read_raw,
.debugfs_reg_access = rcar_gyroadc_reg_access,
};
diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
index ae6d3324f518..cfa1a0f335d0 100644
--- a/drivers/iio/adc/rockchip_saradc.c
+++ b/drivers/iio/adc/rockchip_saradc.c
@@ -125,7 +125,6 @@ static irqreturn_t rockchip_saradc_isr(int irq, void *dev_id)
static const struct iio_info rockchip_saradc_iio_info = {
.read_raw = rockchip_saradc_read_raw,
- .driver_module = THIS_MODULE,
};
#define ADC_CHANNEL(_index, _id) { \
diff --git a/drivers/iio/adc/spear_adc.c b/drivers/iio/adc/spear_adc.c
index 5dd61f6a57b9..b1da2c46107c 100644
--- a/drivers/iio/adc/spear_adc.c
+++ b/drivers/iio/adc/spear_adc.c
@@ -254,7 +254,6 @@ static int spear_adc_configure(struct spear_adc_state *st)
static const struct iio_info spear_adc_info = {
.read_raw = &spear_adc_read_raw,
.write_raw = &spear_adc_write_raw,
- .driver_module = THIS_MODULE,
};
static int spear_adc_probe(struct platform_device *pdev)
diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
index c28e7ff80e11..1331045d9d6f 100644
--- a/drivers/iio/adc/stm32-adc.c
+++ b/drivers/iio/adc/stm32-adc.c
@@ -699,7 +699,6 @@ static const struct iio_info stm32_adc_iio_info = {
.update_scan_mode = stm32_adc_update_scan_mode,
.debugfs_reg_access = stm32_adc_debugfs_reg_access,
.of_xlate = stm32_adc_of_xlate,
- .driver_module = THIS_MODULE,
};
static unsigned int stm32_adc_dma_residue(struct stm32_adc *adc)
diff --git a/drivers/iio/adc/stx104.c b/drivers/iio/adc/stx104.c
index 2da741d27540..17b021f33180 100644
--- a/drivers/iio/adc/stx104.c
+++ b/drivers/iio/adc/stx104.c
@@ -172,7 +172,6 @@ static int stx104_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info stx104_info = {
- .driver_module = THIS_MODULE,
.read_raw = stx104_read_raw,
.write_raw = stx104_write_raw
};
diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c
index b23527309088..72c635cd1470 100644
--- a/drivers/iio/adc/sun4i-gpadc-iio.c
+++ b/drivers/iio/adc/sun4i-gpadc-iio.c
@@ -349,7 +349,6 @@ static int sun4i_gpadc_read_raw(struct iio_dev *indio_dev,
static const struct iio_info sun4i_gpadc_iio_info = {
.read_raw = sun4i_gpadc_read_raw,
- .driver_module = THIS_MODULE,
};
static irqreturn_t sun4i_gpadc_temp_data_irq_handler(int irq, void *dev_id)
diff --git a/drivers/iio/adc/ti-adc081c.c b/drivers/iio/adc/ti-adc081c.c
index 319172cf7da8..405e3779c0c5 100644
--- a/drivers/iio/adc/ti-adc081c.c
+++ b/drivers/iio/adc/ti-adc081c.c
@@ -124,7 +124,6 @@ static struct adcxx1c_model adcxx1c_models[] = {
static const struct iio_info adc081c_info = {
.read_raw = adc081c_read_raw,
- .driver_module = THIS_MODULE,
};
static irqreturn_t adc081c_trigger_handler(int irq, void *p)
diff --git a/drivers/iio/adc/ti-adc0832.c b/drivers/iio/adc/ti-adc0832.c
index e952e94a14af..188dae705bf7 100644
--- a/drivers/iio/adc/ti-adc0832.c
+++ b/drivers/iio/adc/ti-adc0832.c
@@ -195,7 +195,6 @@ static int adc0832_read_raw(struct iio_dev *iio,
static const struct iio_info adc0832_info = {
.read_raw = adc0832_read_raw,
- .driver_module = THIS_MODULE,
};
static irqreturn_t adc0832_trigger_handler(int irq, void *p)
diff --git a/drivers/iio/adc/ti-adc084s021.c b/drivers/iio/adc/ti-adc084s021.c
index a355121c11a4..25504640e126 100644
--- a/drivers/iio/adc/ti-adc084s021.c
+++ b/drivers/iio/adc/ti-adc084s021.c
@@ -186,7 +186,6 @@ static int adc084s021_buffer_postdisable(struct iio_dev *indio_dev)
static const struct iio_info adc084s021_info = {
.read_raw = adc084s021_read_raw,
- .driver_module = THIS_MODULE,
};
static const struct iio_buffer_setup_ops adc084s021_buffer_setup_ops = {
diff --git a/drivers/iio/adc/ti-adc108s102.c b/drivers/iio/adc/ti-adc108s102.c
index de4e5ac98c6e..841203edaac5 100644
--- a/drivers/iio/adc/ti-adc108s102.c
+++ b/drivers/iio/adc/ti-adc108s102.c
@@ -220,7 +220,6 @@ static int adc108s102_read_raw(struct iio_dev *indio_dev,
static const struct iio_info adc108s102_info = {
.read_raw = &adc108s102_read_raw,
.update_scan_mode = &adc108s102_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static int adc108s102_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ti-adc12138.c b/drivers/iio/adc/ti-adc12138.c
index 072f03bfe6a0..bf890244789a 100644
--- a/drivers/iio/adc/ti-adc12138.c
+++ b/drivers/iio/adc/ti-adc12138.c
@@ -277,7 +277,6 @@ static int adc12138_read_raw(struct iio_dev *iio,
static const struct iio_info adc12138_info = {
.read_raw = adc12138_read_raw,
- .driver_module = THIS_MODULE,
};
static int adc12138_init(struct adc12138 *adc)
diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c
index 89dfbd31be5c..7cf39b3e2416 100644
--- a/drivers/iio/adc/ti-adc128s052.c
+++ b/drivers/iio/adc/ti-adc128s052.c
@@ -130,7 +130,6 @@ static const struct adc128_configuration adc128_config[] = {
static const struct iio_info adc128_info = {
.read_raw = adc128_read_raw,
- .driver_module = THIS_MODULE,
};
static int adc128_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ti-adc161s626.c b/drivers/iio/adc/ti-adc161s626.c
index 4836a0d7aef5..10fa7677ac4b 100644
--- a/drivers/iio/adc/ti-adc161s626.c
+++ b/drivers/iio/adc/ti-adc161s626.c
@@ -173,7 +173,6 @@ static int ti_adc_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info ti_adc_info = {
- .driver_module = THIS_MODULE,
.read_raw = ti_adc_read_raw,
};
diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
index f76d979fb7e8..e30362dd868a 100644
--- a/drivers/iio/adc/ti-ads1015.c
+++ b/drivers/iio/adc/ti-ads1015.c
@@ -474,14 +474,12 @@ static const struct attribute_group ads1115_attribute_group = {
};
static const struct iio_info ads1015_info = {
- .driver_module = THIS_MODULE,
.read_raw = ads1015_read_raw,
.write_raw = ads1015_write_raw,
.attrs = &ads1015_attribute_group,
};
static const struct iio_info ads1115_info = {
- .driver_module = THIS_MODULE,
.read_raw = ads1015_read_raw,
.write_raw = ads1015_write_raw,
.attrs = &ads1115_attribute_group,
diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c
index 16a06633332c..9e1c864d3901 100644
--- a/drivers/iio/adc/ti-ads7950.c
+++ b/drivers/iio/adc/ti-ads7950.c
@@ -360,7 +360,6 @@ static int ti_ads7950_read_raw(struct iio_dev *indio_dev,
static const struct iio_info ti_ads7950_info = {
.read_raw = &ti_ads7950_read_raw,
.update_scan_mode = ti_ads7950_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static int ti_ads7950_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c
index 4a163496d9e4..ff4756352ac1 100644
--- a/drivers/iio/adc/ti-ads8688.c
+++ b/drivers/iio/adc/ti-ads8688.c
@@ -369,7 +369,6 @@ static const struct iio_info ads8688_info = {
.write_raw = &ads8688_write_raw,
.write_raw_get_fmt = &ads8688_write_raw_get_fmt,
.attrs = &ads8688_attribute_group,
- .driver_module = THIS_MODULE,
};
static const struct ads8688_chip_info ads8688_chip_info_tbl[] = {
diff --git a/drivers/iio/adc/ti-tlc4541.c b/drivers/iio/adc/ti-tlc4541.c
index 78d91a069ea4..2290024c89fc 100644
--- a/drivers/iio/adc/ti-tlc4541.c
+++ b/drivers/iio/adc/ti-tlc4541.c
@@ -157,7 +157,6 @@ static int tlc4541_read_raw(struct iio_dev *indio_dev,
static const struct iio_info tlc4541_info = {
.read_raw = &tlc4541_read_raw,
- .driver_module = THIS_MODULE,
};
static int tlc4541_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 4282ceca3d8f..685b869fcf4e 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -533,7 +533,6 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
static const struct iio_info tiadc_info = {
.read_raw = &tiadc_read_raw,
- .driver_module = THIS_MODULE,
};
static int tiadc_request_dma(struct platform_device *pdev,
diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
index 0c74869a540a..245b8af61794 100644
--- a/drivers/iio/adc/twl4030-madc.c
+++ b/drivers/iio/adc/twl4030-madc.c
@@ -100,7 +100,6 @@ static int twl4030_madc_read(struct iio_dev *iio_dev,
static const struct iio_info twl4030_madc_iio_info = {
.read_raw = &twl4030_madc_read,
- .driver_module = THIS_MODULE,
};
#define TWL4030_ADC_CHANNEL(_channel, _type, _name) { \
diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
index becbb0aef232..3c5a73ccb1cc 100644
--- a/drivers/iio/adc/twl6030-gpadc.c
+++ b/drivers/iio/adc/twl6030-gpadc.c
@@ -843,7 +843,6 @@ static const struct iio_chan_spec twl6032_gpadc_iio_channels[] = {
static const struct iio_info twl6030_gpadc_iio_info = {
.read_raw = &twl6030_gpadc_read_raw,
- .driver_module = THIS_MODULE,
};
static const struct twl6030_gpadc_platform_data twl6030_pdata = {
diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c
index 01fc76f7d660..b851b44cf1be 100644
--- a/drivers/iio/adc/vf610_adc.c
+++ b/drivers/iio/adc/vf610_adc.c
@@ -799,7 +799,6 @@ static int vf610_adc_reg_access(struct iio_dev *indio_dev,
}
static const struct iio_info vf610_adc_iio_info = {
- .driver_module = THIS_MODULE,
.read_raw = &vf610_read_raw,
.write_raw = &vf610_write_raw,
.debugfs_reg_access = &vf610_adc_reg_access,
diff --git a/drivers/iio/adc/viperboard_adc.c b/drivers/iio/adc/viperboard_adc.c
index 3be2e35721cc..53eb5a4136fe 100644
--- a/drivers/iio/adc/viperboard_adc.c
+++ b/drivers/iio/adc/viperboard_adc.c
@@ -107,7 +107,6 @@ static int vprbrd_iio_read_raw(struct iio_dev *iio_dev,
static const struct iio_info vprbrd_adc_iio_info = {
.read_raw = &vprbrd_iio_read_raw,
- .driver_module = THIS_MODULE,
};
static int vprbrd_adc_probe(struct platform_device *pdev)
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
index 4a60497a1f19..d4f21d1be6c8 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -675,7 +675,6 @@ static int xadc_trigger_set_state(struct iio_trigger *trigger, bool state)
}
static const struct iio_trigger_ops xadc_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = &xadc_trigger_set_state,
};
@@ -1028,7 +1027,6 @@ static const struct iio_info xadc_info = {
.read_event_value = &xadc_read_event_value,
.write_event_value = &xadc_write_event_value,
.update_scan_mode = &xadc_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static const struct of_device_id xadc_of_match_table[] = {
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 05/38] iio:accel: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (3 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 04/38] iio:adc: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 06/38] iio:amplifiers:ad8366 " Jonathan Cameron
` (32 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/accel/adxl345_core.c | 1 -
drivers/iio/accel/bma180.c | 2 --
drivers/iio/accel/bma220_spi.c | 1 -
drivers/iio/accel/bmc150-accel-core.c | 3 ---
drivers/iio/accel/da280.c | 1 -
drivers/iio/accel/da311.c | 1 -
drivers/iio/accel/dmard06.c | 1 -
drivers/iio/accel/dmard09.c | 1 -
drivers/iio/accel/dmard10.c | 1 -
drivers/iio/accel/hid-sensor-accel-3d.c | 1 -
drivers/iio/accel/kxcjk-1013.c | 2 --
drivers/iio/accel/kxsd9.c | 1 -
drivers/iio/accel/mc3230.c | 1 -
drivers/iio/accel/mma7455_core.c | 1 -
drivers/iio/accel/mma7660.c | 1 -
drivers/iio/accel/mma8452.c | 2 --
drivers/iio/accel/mma9551.c | 1 -
drivers/iio/accel/mma9553.c | 1 -
drivers/iio/accel/mxc4005.c | 2 --
drivers/iio/accel/mxc6255.c | 1 -
drivers/iio/accel/sca3000.c | 1 -
drivers/iio/accel/st_accel_core.c | 2 --
drivers/iio/accel/stk8312.c | 2 --
drivers/iio/accel/stk8ba50.c | 2 --
24 files changed, 33 deletions(-)
diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c
index 9ccb5828db98..7251d0e63d74 100644
--- a/drivers/iio/accel/adxl345_core.c
+++ b/drivers/iio/accel/adxl345_core.c
@@ -95,7 +95,6 @@ static int adxl345_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info adxl345_info = {
- .driver_module = THIS_MODULE,
.read_raw = adxl345_read_raw,
};
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 17b7953f2502..66e3e18e329d 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -541,7 +541,6 @@ static const struct iio_info bma180_info = {
.attrs = &bma180_attrs_group,
.read_raw = bma180_read_raw,
.write_raw = bma180_write_raw,
- .driver_module = THIS_MODULE,
};
static const char * const bma180_power_modes[] = { "low_noise", "low_power" };
@@ -722,7 +721,6 @@ static int bma180_trig_try_reen(struct iio_trigger *trig)
static const struct iio_trigger_ops bma180_trigger_ops = {
.set_trigger_state = bma180_data_rdy_trigger_set_state,
.try_reenable = bma180_trig_try_reen,
- .owner = THIS_MODULE,
};
static int bma180_probe(struct i2c_client *client,
diff --git a/drivers/iio/accel/bma220_spi.c b/drivers/iio/accel/bma220_spi.c
index 5099f295dd37..e25d91c017ed 100644
--- a/drivers/iio/accel/bma220_spi.c
+++ b/drivers/iio/accel/bma220_spi.c
@@ -186,7 +186,6 @@ static int bma220_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info bma220_info = {
- .driver_module = THIS_MODULE,
.read_raw = bma220_read_raw,
.write_raw = bma220_write_raw,
.attrs = &bma220_attribute_group,
diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c
index 6b5d3be283c4..1d511c27d128 100644
--- a/drivers/iio/accel/bmc150-accel-core.c
+++ b/drivers/iio/accel/bmc150-accel-core.c
@@ -1100,7 +1100,6 @@ static const struct iio_info bmc150_accel_info = {
.write_event_value = bmc150_accel_write_event,
.write_event_config = bmc150_accel_write_event_config,
.read_event_config = bmc150_accel_read_event_config,
- .driver_module = THIS_MODULE,
};
static const struct iio_info bmc150_accel_info_fifo = {
@@ -1114,7 +1113,6 @@ static const struct iio_info bmc150_accel_info_fifo = {
.validate_trigger = bmc150_accel_validate_trigger,
.hwfifo_set_watermark = bmc150_accel_set_watermark,
.hwfifo_flush_to_buffer = bmc150_accel_fifo_flush,
- .driver_module = THIS_MODULE,
};
static const unsigned long bmc150_accel_scan_masks[] = {
@@ -1206,7 +1204,6 @@ static int bmc150_accel_trigger_set_state(struct iio_trigger *trig,
static const struct iio_trigger_ops bmc150_accel_trigger_ops = {
.set_trigger_state = bmc150_accel_trigger_set_state,
.try_reenable = bmc150_accel_trig_try_reen,
- .owner = THIS_MODULE,
};
static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
diff --git a/drivers/iio/accel/da280.c b/drivers/iio/accel/da280.c
index ed8343aeac9c..6c214783241c 100644
--- a/drivers/iio/accel/da280.c
+++ b/drivers/iio/accel/da280.c
@@ -88,7 +88,6 @@ static int da280_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info da280_info = {
- .driver_module = THIS_MODULE,
.read_raw = da280_read_raw,
};
diff --git a/drivers/iio/accel/da311.c b/drivers/iio/accel/da311.c
index 537cfa8b6edf..0e85f544b4fb 100644
--- a/drivers/iio/accel/da311.c
+++ b/drivers/iio/accel/da311.c
@@ -212,7 +212,6 @@ static int da311_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info da311_info = {
- .driver_module = THIS_MODULE,
.read_raw = da311_read_raw,
};
diff --git a/drivers/iio/accel/dmard06.c b/drivers/iio/accel/dmard06.c
index 656ca8e1927f..d87e2c751475 100644
--- a/drivers/iio/accel/dmard06.c
+++ b/drivers/iio/accel/dmard06.c
@@ -124,7 +124,6 @@ static int dmard06_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info dmard06_info = {
- .driver_module = THIS_MODULE,
.read_raw = dmard06_read_raw,
};
diff --git a/drivers/iio/accel/dmard09.c b/drivers/iio/accel/dmard09.c
index d3a28f96565c..16a7e74f5e9a 100644
--- a/drivers/iio/accel/dmard09.c
+++ b/drivers/iio/accel/dmard09.c
@@ -93,7 +93,6 @@ static int dmard09_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info dmard09_info = {
- .driver_module = THIS_MODULE,
.read_raw = dmard09_read_raw,
};
diff --git a/drivers/iio/accel/dmard10.c b/drivers/iio/accel/dmard10.c
index b8736cc75656..9518ea00167e 100644
--- a/drivers/iio/accel/dmard10.c
+++ b/drivers/iio/accel/dmard10.c
@@ -170,7 +170,6 @@ static int dmard10_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info dmard10_info = {
- .driver_module = THIS_MODULE,
.read_raw = dmard10_read_raw,
};
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index 2238a26aba63..c066a3bdbff7 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -225,7 +225,6 @@ static int accel_3d_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info accel_3d_info = {
- .driver_module = THIS_MODULE,
.read_raw = &accel_3d_read_raw,
.write_raw = &accel_3d_write_raw,
};
diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index 3f968c46e667..1e0b59f3e221 100644
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -950,7 +950,6 @@ static const struct iio_info kxcjk1013_info = {
.write_event_value = kxcjk1013_write_event,
.write_event_config = kxcjk1013_write_event_config,
.read_event_config = kxcjk1013_read_event_config,
- .driver_module = THIS_MODULE,
};
static const unsigned long kxcjk1013_scan_masks[] = {0x7, 0};
@@ -1036,7 +1035,6 @@ static int kxcjk1013_data_rdy_trigger_set_state(struct iio_trigger *trig,
static const struct iio_trigger_ops kxcjk1013_trigger_ops = {
.set_trigger_state = kxcjk1013_data_rdy_trigger_set_state,
.try_reenable = kxcjk1013_trig_try_reen,
- .owner = THIS_MODULE,
};
static irqreturn_t kxcjk1013_event_handler(int irq, void *private)
diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index 9af60ac70738..0c0df4fce420 100644
--- a/drivers/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
@@ -390,7 +390,6 @@ static const struct iio_info kxsd9_info = {
.read_raw = &kxsd9_read_raw,
.write_raw = &kxsd9_write_raw,
.attrs = &kxsd9_attribute_group,
- .driver_module = THIS_MODULE,
};
/* Four channels apart from timestamp, scan mask = 0x0f */
diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
index 4ea2ff623a6d..8b11604eed63 100644
--- a/drivers/iio/accel/mc3230.c
+++ b/drivers/iio/accel/mc3230.c
@@ -107,7 +107,6 @@ static int mc3230_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info mc3230_info = {
- .driver_module = THIS_MODULE,
.read_raw = mc3230_read_raw,
};
diff --git a/drivers/iio/accel/mma7455_core.c b/drivers/iio/accel/mma7455_core.c
index 6551085bedd7..da0ceaac46b5 100644
--- a/drivers/iio/accel/mma7455_core.c
+++ b/drivers/iio/accel/mma7455_core.c
@@ -199,7 +199,6 @@ static const struct iio_info mma7455_info = {
.attrs = &mma7455_group,
.read_raw = mma7455_read_raw,
.write_raw = mma7455_write_raw,
- .driver_module = THIS_MODULE,
};
#define MMA7455_CHANNEL(axis, idx) { \
diff --git a/drivers/iio/accel/mma7660.c b/drivers/iio/accel/mma7660.c
index 42fa57e41bdd..f1a13724efb3 100644
--- a/drivers/iio/accel/mma7660.c
+++ b/drivers/iio/accel/mma7660.c
@@ -168,7 +168,6 @@ static int mma7660_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info mma7660_info = {
- .driver_module = THIS_MODULE,
.read_raw = mma7660_read_raw,
.attrs = &mma7660_attribute_group,
};
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index eb6e3dc789b2..7094c2ffcdc4 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -1337,7 +1337,6 @@ static const struct iio_info mma8452_info = {
.read_event_config = &mma8452_read_event_config,
.write_event_config = &mma8452_write_event_config,
.debugfs_reg_access = &mma8452_reg_access_dbg,
- .driver_module = THIS_MODULE,
};
static const unsigned long mma8452_scan_masks[] = {0x7, 0};
@@ -1368,7 +1367,6 @@ static int mma8452_data_rdy_trigger_set_state(struct iio_trigger *trig,
static const struct iio_trigger_ops mma8452_trigger_ops = {
.set_trigger_state = mma8452_data_rdy_trigger_set_state,
.validate_device = iio_trigger_validate_own_device,
- .owner = THIS_MODULE,
};
static int mma8452_trigger_setup(struct iio_dev *indio_dev)
diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c
index bf2704435629..715000389f74 100644
--- a/drivers/iio/accel/mma9551.c
+++ b/drivers/iio/accel/mma9551.c
@@ -333,7 +333,6 @@ static const struct iio_chan_spec mma9551_channels[] = {
};
static const struct iio_info mma9551_info = {
- .driver_module = THIS_MODULE,
.read_raw = mma9551_read_raw,
.read_event_config = mma9551_read_event_config,
.write_event_config = mma9551_write_event_config,
diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c
index 36bf19733be0..b52a3f182190 100644
--- a/drivers/iio/accel/mma9553.c
+++ b/drivers/iio/accel/mma9553.c
@@ -987,7 +987,6 @@ static const struct iio_chan_spec mma9553_channels[] = {
};
static const struct iio_info mma9553_info = {
- .driver_module = THIS_MODULE,
.read_raw = mma9553_read_raw,
.write_raw = mma9553_write_raw,
.read_event_config = mma9553_read_event_config,
diff --git a/drivers/iio/accel/mxc4005.c b/drivers/iio/accel/mxc4005.c
index c23f47af7256..58099e40d717 100644
--- a/drivers/iio/accel/mxc4005.c
+++ b/drivers/iio/accel/mxc4005.c
@@ -264,7 +264,6 @@ static int mxc4005_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info mxc4005_info = {
- .driver_module = THIS_MODULE,
.read_raw = mxc4005_read_raw,
.write_raw = mxc4005_write_raw,
.attrs = &mxc4005_attrs_group,
@@ -376,7 +375,6 @@ static int mxc4005_trigger_try_reen(struct iio_trigger *trig)
static const struct iio_trigger_ops mxc4005_trigger_ops = {
.set_trigger_state = mxc4005_set_trigger_state,
.try_reenable = mxc4005_trigger_try_reen,
- .owner = THIS_MODULE,
};
static int mxc4005_chip_init(struct mxc4005_data *data)
diff --git a/drivers/iio/accel/mxc6255.c b/drivers/iio/accel/mxc6255.c
index 0abad6948201..ddd50d1781c5 100644
--- a/drivers/iio/accel/mxc6255.c
+++ b/drivers/iio/accel/mxc6255.c
@@ -78,7 +78,6 @@ static int mxc6255_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info mxc6255_info = {
- .driver_module = THIS_MODULE,
.read_raw = mxc6255_read_raw,
};
diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c
index cb1d83fa19a0..23c9c0929312 100644
--- a/drivers/iio/accel/sca3000.c
+++ b/drivers/iio/accel/sca3000.c
@@ -1454,7 +1454,6 @@ static const struct iio_info sca3000_info = {
.write_event_value = &sca3000_write_event_value,
.read_event_config = &sca3000_read_event_config,
.write_event_config = &sca3000_write_event_config,
- .driver_module = THIS_MODULE,
};
static int sca3000_probe(struct spi_device *spi)
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 07d1489cd457..71e3882709af 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -689,7 +689,6 @@ static const struct attribute_group st_accel_attribute_group = {
};
static const struct iio_info accel_info = {
- .driver_module = THIS_MODULE,
.attrs = &st_accel_attribute_group,
.read_raw = &st_accel_read_raw,
.write_raw = &st_accel_write_raw,
@@ -698,7 +697,6 @@ static const struct iio_info accel_info = {
#ifdef CONFIG_IIO_TRIGGER
static const struct iio_trigger_ops st_accel_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = ST_ACCEL_TRIGGER_SET_STATE,
.validate_device = st_sensors_validate_device,
};
diff --git a/drivers/iio/accel/stk8312.c b/drivers/iio/accel/stk8312.c
index e31023dc5f1b..cacc0da2f874 100644
--- a/drivers/iio/accel/stk8312.c
+++ b/drivers/iio/accel/stk8312.c
@@ -237,7 +237,6 @@ static int stk8312_data_rdy_trigger_set_state(struct iio_trigger *trig,
static const struct iio_trigger_ops stk8312_trigger_ops = {
.set_trigger_state = stk8312_data_rdy_trigger_set_state,
- .owner = THIS_MODULE,
};
static int stk8312_set_sample_rate(struct stk8312_data *data, u8 rate)
@@ -421,7 +420,6 @@ static int stk8312_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info stk8312_info = {
- .driver_module = THIS_MODULE,
.read_raw = stk8312_read_raw,
.write_raw = stk8312_write_raw,
.attrs = &stk8312_attribute_group,
diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c
index 300d955bad00..576b6b140f08 100644
--- a/drivers/iio/accel/stk8ba50.c
+++ b/drivers/iio/accel/stk8ba50.c
@@ -179,7 +179,6 @@ static int stk8ba50_data_rdy_trigger_set_state(struct iio_trigger *trig,
static const struct iio_trigger_ops stk8ba50_trigger_ops = {
.set_trigger_state = stk8ba50_data_rdy_trigger_set_state,
- .owner = THIS_MODULE,
};
static int stk8ba50_set_power(struct stk8ba50_data *data, bool mode)
@@ -307,7 +306,6 @@ static int stk8ba50_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info stk8ba50_info = {
- .driver_module = THIS_MODULE,
.read_raw = stk8ba50_read_raw,
.write_raw = stk8ba50_write_raw,
.attrs = &stk8ba50_attribute_group,
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 06/38] iio:amplifiers:ad8366 drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (4 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 05/38] iio:accel: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 07/38] iio:chemical: " Jonathan Cameron
` (31 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/amplifiers/ad8366.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/iio/amplifiers/ad8366.c b/drivers/iio/amplifiers/ad8366.c
index 102c7174da5b..43667866321e 100644
--- a/drivers/iio/amplifiers/ad8366.c
+++ b/drivers/iio/amplifiers/ad8366.c
@@ -117,7 +117,6 @@ static int ad8366_write_raw(struct iio_dev *indio_dev,
static const struct iio_info ad8366_info = {
.read_raw = &ad8366_read_raw,
.write_raw = &ad8366_write_raw,
- .driver_module = THIS_MODULE,
};
#define AD8366_CHAN(_channel) { \
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 07/38] iio:chemical: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (5 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 06/38] iio:amplifiers:ad8366 " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 08/38] iio:common: " Jonathan Cameron
` (30 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/chemical/ams-iaq-core.c | 1 -
drivers/iio/chemical/atlas-ph-sensor.c | 2 --
drivers/iio/chemical/vz89x.c | 1 -
3 files changed, 4 deletions(-)
diff --git a/drivers/iio/chemical/ams-iaq-core.c b/drivers/iio/chemical/ams-iaq-core.c
index c948ad2ee9ad..d9e5950ad24a 100644
--- a/drivers/iio/chemical/ams-iaq-core.c
+++ b/drivers/iio/chemical/ams-iaq-core.c
@@ -141,7 +141,6 @@ static int ams_iaqcore_read_raw(struct iio_dev *indio_dev,
static const struct iio_info ams_iaqcore_info = {
.read_raw = ams_iaqcore_read_raw,
- .driver_module = THIS_MODULE,
};
static int ams_iaqcore_probe(struct i2c_client *client,
diff --git a/drivers/iio/chemical/atlas-ph-sensor.c b/drivers/iio/chemical/atlas-ph-sensor.c
index ef761a508630..8c4e05580091 100644
--- a/drivers/iio/chemical/atlas-ph-sensor.c
+++ b/drivers/iio/chemical/atlas-ph-sensor.c
@@ -344,7 +344,6 @@ static int atlas_buffer_predisable(struct iio_dev *indio_dev)
}
static const struct iio_trigger_ops atlas_interrupt_trigger_ops = {
- .owner = THIS_MODULE,
};
static const struct iio_buffer_setup_ops atlas_buffer_setup_ops = {
@@ -499,7 +498,6 @@ static int atlas_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info atlas_info = {
- .driver_module = THIS_MODULE,
.read_raw = atlas_read_raw,
.write_raw = atlas_write_raw,
};
diff --git a/drivers/iio/chemical/vz89x.c b/drivers/iio/chemical/vz89x.c
index f75eea6822f2..9c9095ba4227 100644
--- a/drivers/iio/chemical/vz89x.c
+++ b/drivers/iio/chemical/vz89x.c
@@ -326,7 +326,6 @@ static int vz89x_read_raw(struct iio_dev *indio_dev,
static const struct iio_info vz89x_info = {
.attrs = &vz89x_attrs_group,
.read_raw = vz89x_read_raw,
- .driver_module = THIS_MODULE,
};
static const struct vz89x_chip_data vz89x_chips[] = {
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 08/38] iio:common: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (6 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 07/38] iio:chemical: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 09/38] iio:counter:104-quad-8 drop assign iio_info.driver_module Jonathan Cameron
` (29 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Clearly this set jumps across multiple areas, but inherently it
can't be grouped like the other sets in this series so I've done
all the stuff in the common directory together.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c | 1 -
drivers/iio/common/hid-sensors/hid-sensor-trigger.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
index 38e8783e4b05..ed8063f2da99 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
@@ -185,7 +185,6 @@ static int cros_ec_sensors_write(struct iio_dev *indio_dev,
static const struct iio_info ec_sensors_info = {
.read_raw = &cros_ec_sensors_read,
.write_raw = &cros_ec_sensors_write,
- .driver_module = THIS_MODULE,
};
static int cros_ec_sensors_probe(struct platform_device *pdev)
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
index 16ade0a0327b..1f967cce2714 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
@@ -241,7 +241,6 @@ void hid_sensor_remove_trigger(struct hid_sensor_common *attrb)
EXPORT_SYMBOL(hid_sensor_remove_trigger);
static const struct iio_trigger_ops hid_sensor_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = &hid_sensor_data_rdy_trigger_set_state,
};
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 09/38] iio:counter:104-quad-8 drop assign iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (7 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 08/38] iio:common: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 10/38] iio:dac: drop assignment of iio_info.driver_module Jonathan Cameron
` (28 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent is now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/counter/104-quad-8.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/iio/counter/104-quad-8.c b/drivers/iio/counter/104-quad-8.c
index ba3d9030cd51..b56985078d8c 100644
--- a/drivers/iio/counter/104-quad-8.c
+++ b/drivers/iio/counter/104-quad-8.c
@@ -185,7 +185,6 @@ static int quad8_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info quad8_info = {
- .driver_module = THIS_MODULE,
.read_raw = quad8_read_raw,
.write_raw = quad8_write_raw
};
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 10/38] iio:dac: drop assignment of iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (8 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 09/38] iio:counter:104-quad-8 drop assign iio_info.driver_module Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 11/38] iio:dummy: " Jonathan Cameron
` (27 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of this is now done via macro magic when
the relevant register call is made. The actual structure
element will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/dac/ad5064.c | 1 -
drivers/iio/dac/ad5360.c | 1 -
drivers/iio/dac/ad5380.c | 1 -
drivers/iio/dac/ad5421.c | 1 -
drivers/iio/dac/ad5446.c | 1 -
drivers/iio/dac/ad5449.c | 1 -
drivers/iio/dac/ad5504.c | 1 -
drivers/iio/dac/ad5592r-base.c | 1 -
drivers/iio/dac/ad5624r_spi.c | 1 -
drivers/iio/dac/ad5686.c | 1 -
drivers/iio/dac/ad5755.c | 1 -
drivers/iio/dac/ad5761.c | 1 -
drivers/iio/dac/ad5764.c | 1 -
drivers/iio/dac/ad5791.c | 1 -
drivers/iio/dac/ad7303.c | 1 -
drivers/iio/dac/ad8801.c | 1 -
drivers/iio/dac/cio-dac.c | 1 -
drivers/iio/dac/dpot-dac.c | 1 -
drivers/iio/dac/lpc18xx_dac.c | 1 -
drivers/iio/dac/ltc2632.c | 1 -
drivers/iio/dac/m62332.c | 1 -
drivers/iio/dac/max517.c | 1 -
drivers/iio/dac/max5821.c | 1 -
drivers/iio/dac/mcp4725.c | 1 -
drivers/iio/dac/mcp4922.c | 1 -
drivers/iio/dac/stm32-dac.c | 1 -
drivers/iio/dac/vf610_dac.c | 1 -
27 files changed, 27 deletions(-)
diff --git a/drivers/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c
index 3f9399c27869..bf4fc40ec84d 100644
--- a/drivers/iio/dac/ad5064.c
+++ b/drivers/iio/dac/ad5064.c
@@ -366,7 +366,6 @@ static int ad5064_write_raw(struct iio_dev *indio_dev,
static const struct iio_info ad5064_info = {
.read_raw = ad5064_read_raw,
.write_raw = ad5064_write_raw,
- .driver_module = THIS_MODULE,
};
static const struct iio_chan_spec_ext_info ad5064_ext_info[] = {
diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c
index 8ba0e9c50176..0209316d5566 100644
--- a/drivers/iio/dac/ad5360.c
+++ b/drivers/iio/dac/ad5360.c
@@ -425,7 +425,6 @@ static const struct iio_info ad5360_info = {
.read_raw = ad5360_read_raw,
.write_raw = ad5360_write_raw,
.attrs = &ad5360_attribute_group,
- .driver_module = THIS_MODULE,
};
static const char * const ad5360_vref_name[] = {
diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c
index 97d2c5111f43..845fd1c0fd9d 100644
--- a/drivers/iio/dac/ad5380.c
+++ b/drivers/iio/dac/ad5380.c
@@ -237,7 +237,6 @@ static int ad5380_read_raw(struct iio_dev *indio_dev,
static const struct iio_info ad5380_info = {
.read_raw = ad5380_read_raw,
.write_raw = ad5380_write_raw,
- .driver_module = THIS_MODULE,
};
static struct iio_chan_spec_ext_info ad5380_ext_info[] = {
diff --git a/drivers/iio/dac/ad5421.c b/drivers/iio/dac/ad5421.c
index 559061ab1982..8e9633d8de67 100644
--- a/drivers/iio/dac/ad5421.c
+++ b/drivers/iio/dac/ad5421.c
@@ -465,7 +465,6 @@ static const struct iio_info ad5421_info = {
.read_event_config = ad5421_read_event_config,
.write_event_config = ad5421_write_event_config,
.read_event_value = ad5421_read_event_value,
- .driver_module = THIS_MODULE,
};
static int ad5421_probe(struct spi_device *spi)
diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c
index b555552a0d80..c6c22f3520eb 100644
--- a/drivers/iio/dac/ad5446.c
+++ b/drivers/iio/dac/ad5446.c
@@ -212,7 +212,6 @@ static int ad5446_write_raw(struct iio_dev *indio_dev,
static const struct iio_info ad5446_info = {
.read_raw = ad5446_read_raw,
.write_raw = ad5446_write_raw,
- .driver_module = THIS_MODULE,
};
static int ad5446_probe(struct device *dev, const char *name,
diff --git a/drivers/iio/dac/ad5449.c b/drivers/iio/dac/ad5449.c
index 5f3202339420..317a74129932 100644
--- a/drivers/iio/dac/ad5449.c
+++ b/drivers/iio/dac/ad5449.c
@@ -193,7 +193,6 @@ static int ad5449_write_raw(struct iio_dev *indio_dev,
static const struct iio_info ad5449_info = {
.read_raw = ad5449_read_raw,
.write_raw = ad5449_write_raw,
- .driver_module = THIS_MODULE,
};
#define AD5449_CHANNEL(chan, bits) { \
diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c
index 712d86b4be09..d9037ea59168 100644
--- a/drivers/iio/dac/ad5504.c
+++ b/drivers/iio/dac/ad5504.c
@@ -232,7 +232,6 @@ static const struct iio_info ad5504_info = {
.write_raw = ad5504_write_raw,
.read_raw = ad5504_read_raw,
.event_attrs = &ad5504_ev_attribute_group,
- .driver_module = THIS_MODULE,
};
static const struct iio_chan_spec_ext_info ad5504_ext_info[] = {
diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c
index 69bde5909854..9234c6a09a93 100644
--- a/drivers/iio/dac/ad5592r-base.c
+++ b/drivers/iio/dac/ad5592r-base.c
@@ -474,7 +474,6 @@ static const struct iio_info ad5592r_info = {
.read_raw = ad5592r_read_raw,
.write_raw = ad5592r_write_raw,
.write_raw_get_fmt = ad5592r_write_raw_get_fmt,
- .driver_module = THIS_MODULE,
};
static ssize_t ad5592r_show_scale_available(struct iio_dev *iio_dev,
diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c
index 5489ec43b95d..13fdb4dfe356 100644
--- a/drivers/iio/dac/ad5624r_spi.c
+++ b/drivers/iio/dac/ad5624r_spi.c
@@ -149,7 +149,6 @@ static ssize_t ad5624r_write_dac_powerdown(struct iio_dev *indio_dev,
static const struct iio_info ad5624r_info = {
.write_raw = ad5624r_write_raw,
.read_raw = ad5624r_read_raw,
- .driver_module = THIS_MODULE,
};
static const struct iio_chan_spec_ext_info ad5624r_ext_info[] = {
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c
index d1d8450c19f6..20254df7f9c7 100644
--- a/drivers/iio/dac/ad5686.c
+++ b/drivers/iio/dac/ad5686.c
@@ -252,7 +252,6 @@ static int ad5686_write_raw(struct iio_dev *indio_dev,
static const struct iio_info ad5686_info = {
.read_raw = ad5686_read_raw,
.write_raw = ad5686_write_raw,
- .driver_module = THIS_MODULE,
};
static const struct iio_chan_spec_ext_info ad5686_ext_info[] = {
diff --git a/drivers/iio/dac/ad5755.c b/drivers/iio/dac/ad5755.c
index 5f7968232564..2d03cc89ba50 100644
--- a/drivers/iio/dac/ad5755.c
+++ b/drivers/iio/dac/ad5755.c
@@ -417,7 +417,6 @@ static ssize_t ad5755_write_powerdown(struct iio_dev *indio_dev, uintptr_t priv,
static const struct iio_info ad5755_info = {
.read_raw = ad5755_read_raw,
.write_raw = ad5755_write_raw,
- .driver_module = THIS_MODULE,
};
static const struct iio_chan_spec_ext_info ad5755_ext_info[] = {
diff --git a/drivers/iio/dac/ad5761.c b/drivers/iio/dac/ad5761.c
index d6510d6928b3..05017c8bbd00 100644
--- a/drivers/iio/dac/ad5761.c
+++ b/drivers/iio/dac/ad5761.c
@@ -251,7 +251,6 @@ static int ad5761_write_raw(struct iio_dev *indio_dev,
static const struct iio_info ad5761_info = {
.read_raw = &ad5761_read_raw,
.write_raw = &ad5761_write_raw,
- .driver_module = THIS_MODULE,
};
#define AD5761_CHAN(_bits) { \
diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c
index 9a547bbf7d2b..033f20eca616 100644
--- a/drivers/iio/dac/ad5764.c
+++ b/drivers/iio/dac/ad5764.c
@@ -268,7 +268,6 @@ static int ad5764_read_raw(struct iio_dev *indio_dev,
static const struct iio_info ad5764_info = {
.read_raw = ad5764_read_raw,
.write_raw = ad5764_write_raw,
- .driver_module = THIS_MODULE,
};
static int ad5764_probe(struct spi_device *spi)
diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c
index 33e4ae5c42f8..7569bf6868c2 100644
--- a/drivers/iio/dac/ad5791.c
+++ b/drivers/iio/dac/ad5791.c
@@ -340,7 +340,6 @@ static int ad5791_write_raw(struct iio_dev *indio_dev,
static const struct iio_info ad5791_info = {
.read_raw = &ad5791_read_raw,
.write_raw = &ad5791_write_raw,
- .driver_module = THIS_MODULE,
};
static int ad5791_probe(struct spi_device *spi)
diff --git a/drivers/iio/dac/ad7303.c b/drivers/iio/dac/ad7303.c
index 4b0f942b8914..8f3bd19b6dc3 100644
--- a/drivers/iio/dac/ad7303.c
+++ b/drivers/iio/dac/ad7303.c
@@ -161,7 +161,6 @@ static int ad7303_write_raw(struct iio_dev *indio_dev,
static const struct iio_info ad7303_info = {
.read_raw = ad7303_read_raw,
.write_raw = ad7303_write_raw,
- .driver_module = THIS_MODULE,
};
static const struct iio_chan_spec_ext_info ad7303_ext_info[] = {
diff --git a/drivers/iio/dac/ad8801.c b/drivers/iio/dac/ad8801.c
index f06faa1aec09..aef5808c9865 100644
--- a/drivers/iio/dac/ad8801.c
+++ b/drivers/iio/dac/ad8801.c
@@ -92,7 +92,6 @@ static int ad8801_read_raw(struct iio_dev *indio_dev,
static const struct iio_info ad8801_info = {
.read_raw = ad8801_read_raw,
.write_raw = ad8801_write_raw,
- .driver_module = THIS_MODULE,
};
#define AD8801_CHANNEL(chan) { \
diff --git a/drivers/iio/dac/cio-dac.c b/drivers/iio/dac/cio-dac.c
index a8dffd938615..6898b0c79013 100644
--- a/drivers/iio/dac/cio-dac.c
+++ b/drivers/iio/dac/cio-dac.c
@@ -85,7 +85,6 @@ static int cio_dac_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info cio_dac_info = {
- .driver_module = THIS_MODULE,
.read_raw = cio_dac_read_raw,
.write_raw = cio_dac_write_raw
};
diff --git a/drivers/iio/dac/dpot-dac.c b/drivers/iio/dac/dpot-dac.c
index 960a2b430480..aaa2103d7c2b 100644
--- a/drivers/iio/dac/dpot-dac.c
+++ b/drivers/iio/dac/dpot-dac.c
@@ -128,7 +128,6 @@ static const struct iio_info dpot_dac_info = {
.read_raw = dpot_dac_read_raw,
.read_avail = dpot_dac_read_avail,
.write_raw = dpot_dac_write_raw,
- .driver_module = THIS_MODULE,
};
static int dpot_dac_channel_max_ohms(struct iio_dev *indio_dev)
diff --git a/drivers/iio/dac/lpc18xx_dac.c b/drivers/iio/dac/lpc18xx_dac.c
index 55d1456a059d..7036f77fdf23 100644
--- a/drivers/iio/dac/lpc18xx_dac.c
+++ b/drivers/iio/dac/lpc18xx_dac.c
@@ -103,7 +103,6 @@ static int lpc18xx_dac_write_raw(struct iio_dev *indio_dev,
static const struct iio_info lpc18xx_dac_info = {
.read_raw = lpc18xx_dac_read_raw,
.write_raw = lpc18xx_dac_write_raw,
- .driver_module = THIS_MODULE,
};
static int lpc18xx_dac_probe(struct platform_device *pdev)
diff --git a/drivers/iio/dac/ltc2632.c b/drivers/iio/dac/ltc2632.c
index ac5e05f6eb8b..af2ddd0dd341 100644
--- a/drivers/iio/dac/ltc2632.c
+++ b/drivers/iio/dac/ltc2632.c
@@ -159,7 +159,6 @@ static ssize_t ltc2632_write_dac_powerdown(struct iio_dev *indio_dev,
static const struct iio_info ltc2632_info = {
.write_raw = ltc2632_write_raw,
.read_raw = ltc2632_read_raw,
- .driver_module = THIS_MODULE,
};
static const struct iio_chan_spec_ext_info ltc2632_ext_info[] = {
diff --git a/drivers/iio/dac/m62332.c b/drivers/iio/dac/m62332.c
index 76e8b044b979..19031943dabe 100644
--- a/drivers/iio/dac/m62332.c
+++ b/drivers/iio/dac/m62332.c
@@ -174,7 +174,6 @@ static SIMPLE_DEV_PM_OPS(m62332_pm_ops, m62332_suspend, m62332_resume);
static const struct iio_info m62332_info = {
.read_raw = m62332_read_raw,
.write_raw = m62332_write_raw,
- .driver_module = THIS_MODULE,
};
#define M62332_CHANNEL(chan) { \
diff --git a/drivers/iio/dac/max517.c b/drivers/iio/dac/max517.c
index 5507b3970b4b..1d853247a205 100644
--- a/drivers/iio/dac/max517.c
+++ b/drivers/iio/dac/max517.c
@@ -137,7 +137,6 @@ static SIMPLE_DEV_PM_OPS(max517_pm_ops, max517_suspend, max517_resume);
static const struct iio_info max517_info = {
.read_raw = max517_read_raw,
.write_raw = max517_write_raw,
- .driver_module = THIS_MODULE,
};
#define MAX517_CHANNEL(chan) { \
diff --git a/drivers/iio/dac/max5821.c b/drivers/iio/dac/max5821.c
index 193fac3059a3..d0ecc1fdd8fc 100644
--- a/drivers/iio/dac/max5821.c
+++ b/drivers/iio/dac/max5821.c
@@ -300,7 +300,6 @@ static SIMPLE_DEV_PM_OPS(max5821_pm_ops, max5821_suspend, max5821_resume);
static const struct iio_info max5821_info = {
.read_raw = max5821_read_raw,
.write_raw = max5821_write_raw,
- .driver_module = THIS_MODULE,
};
static int max5821_probe(struct i2c_client *client,
diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c
index 6ab1f23e5a79..afa856d10c26 100644
--- a/drivers/iio/dac/mcp4725.c
+++ b/drivers/iio/dac/mcp4725.c
@@ -363,7 +363,6 @@ static const struct iio_info mcp4725_info = {
.read_raw = mcp4725_read_raw,
.write_raw = mcp4725_write_raw,
.attrs = &mcp4725_attribute_group,
- .driver_module = THIS_MODULE,
};
#ifdef CONFIG_OF
diff --git a/drivers/iio/dac/mcp4922.c b/drivers/iio/dac/mcp4922.c
index 3854d201a5d6..bf9aa3fc0534 100644
--- a/drivers/iio/dac/mcp4922.c
+++ b/drivers/iio/dac/mcp4922.c
@@ -119,7 +119,6 @@ static const struct iio_chan_spec mcp4922_channels[3][MCP4922_NUM_CHANNELS] = {
static const struct iio_info mcp4922_info = {
.read_raw = &mcp4922_read_raw,
.write_raw = &mcp4922_write_raw,
- .driver_module = THIS_MODULE,
};
static int mcp4922_probe(struct spi_device *spi)
diff --git a/drivers/iio/dac/stm32-dac.c b/drivers/iio/dac/stm32-dac.c
index 50f8ec091058..7790d30d52a0 100644
--- a/drivers/iio/dac/stm32-dac.c
+++ b/drivers/iio/dac/stm32-dac.c
@@ -156,7 +156,6 @@ static const struct iio_info stm32_dac_iio_info = {
.read_raw = stm32_dac_read_raw,
.write_raw = stm32_dac_write_raw,
.debugfs_reg_access = stm32_dac_debugfs_reg_access,
- .driver_module = THIS_MODULE,
};
static const char * const stm32_dac_powerdown_modes[] = {
diff --git a/drivers/iio/dac/vf610_dac.c b/drivers/iio/dac/vf610_dac.c
index c4ec7779b394..5dccdd16cab3 100644
--- a/drivers/iio/dac/vf610_dac.c
+++ b/drivers/iio/dac/vf610_dac.c
@@ -167,7 +167,6 @@ static int vf610_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info vf610_dac_iio_info = {
- .driver_module = THIS_MODULE,
.read_raw = &vf610_read_raw,
.write_raw = &vf610_write_raw,
};
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 11/38] iio:dummy: drop assignment of iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (9 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 10/38] iio:dac: drop assignment of iio_info.driver_module Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 12/38] iio:frequency: drop assign iio_info.driver_module Jonathan Cameron
` (26 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent is now done via macro magic when
the relevant register call is made. The actual structure
element will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/dummy/iio_simple_dummy.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/iio/dummy/iio_simple_dummy.c b/drivers/iio/dummy/iio_simple_dummy.c
index ad3410e528b6..a45d01e9b8e8 100644
--- a/drivers/iio/dummy/iio_simple_dummy.c
+++ b/drivers/iio/dummy/iio_simple_dummy.c
@@ -519,7 +519,6 @@ static int iio_dummy_write_raw(struct iio_dev *indio_dev,
* Device type specific information.
*/
static const struct iio_info iio_dummy_info = {
- .driver_module = THIS_MODULE,
.read_raw = &iio_dummy_read_raw,
.write_raw = &iio_dummy_write_raw,
#ifdef CONFIG_IIO_SIMPLE_DUMMY_EVENTS
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 12/38] iio:frequency: drop assign iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (10 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 11/38] iio:dummy: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 13/38] iio:gyro: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
` (25 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent is now done via macro magic when
the relevant register call is made. The actual structure
element will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/frequency/ad9523.c | 1 -
drivers/iio/frequency/adf4350.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/iio/frequency/ad9523.c b/drivers/iio/frequency/ad9523.c
index 99eba524f6dd..ddb6a334ae68 100644
--- a/drivers/iio/frequency/ad9523.c
+++ b/drivers/iio/frequency/ad9523.c
@@ -738,7 +738,6 @@ static const struct iio_info ad9523_info = {
.write_raw = &ad9523_write_raw,
.debugfs_reg_access = &ad9523_reg_access,
.attrs = &ad9523_attribute_group,
- .driver_module = THIS_MODULE,
};
static int ad9523_setup(struct iio_dev *indio_dev)
diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
index d2d824b446f5..6d768431d90e 100644
--- a/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@ -374,7 +374,6 @@ static const struct iio_chan_spec adf4350_chan = {
static const struct iio_info adf4350_info = {
.debugfs_reg_access = &adf4350_reg_access,
- .driver_module = THIS_MODULE,
};
#ifdef CONFIG_OF
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 13/38] iio:gyro: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (11 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 12/38] iio:frequency: drop assign iio_info.driver_module Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 14/38] iio:health: " Jonathan Cameron
` (24 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/gyro/adis16080.c | 1 -
drivers/iio/gyro/adis16130.c | 1 -
drivers/iio/gyro/adis16136.c | 1 -
drivers/iio/gyro/adis16260.c | 1 -
drivers/iio/gyro/adxrs450.c | 1 -
drivers/iio/gyro/bmg160_core.c | 2 --
drivers/iio/gyro/hid-sensor-gyro-3d.c | 1 -
drivers/iio/gyro/itg3200_buffer.c | 1 -
drivers/iio/gyro/itg3200_core.c | 1 -
drivers/iio/gyro/mpu3050-core.c | 2 --
drivers/iio/gyro/st_gyro_core.c | 2 --
11 files changed, 14 deletions(-)
diff --git a/drivers/iio/gyro/adis16080.c b/drivers/iio/gyro/adis16080.c
index ad31a1372a04..a551ebde4762 100644
--- a/drivers/iio/gyro/adis16080.c
+++ b/drivers/iio/gyro/adis16080.c
@@ -163,7 +163,6 @@ static const struct iio_chan_spec adis16080_channels[] = {
static const struct iio_info adis16080_info = {
.read_raw = &adis16080_read_raw,
- .driver_module = THIS_MODULE,
};
enum {
diff --git a/drivers/iio/gyro/adis16130.c b/drivers/iio/gyro/adis16130.c
index e5241f41e65e..aea80ab04122 100644
--- a/drivers/iio/gyro/adis16130.c
+++ b/drivers/iio/gyro/adis16130.c
@@ -137,7 +137,6 @@ static const struct iio_chan_spec adis16130_channels[] = {
static const struct iio_info adis16130_info = {
.read_raw = &adis16130_read_raw,
- .driver_module = THIS_MODULE,
};
static int adis16130_probe(struct spi_device *spi)
diff --git a/drivers/iio/gyro/adis16136.c b/drivers/iio/gyro/adis16136.c
index b04faf93e1bc..90ec4bed62b7 100644
--- a/drivers/iio/gyro/adis16136.c
+++ b/drivers/iio/gyro/adis16136.c
@@ -398,7 +398,6 @@ static const struct attribute_group adis16136_attribute_group = {
};
static const struct iio_info adis16136_info = {
- .driver_module = THIS_MODULE,
.attrs = &adis16136_attribute_group,
.read_raw = &adis16136_read_raw,
.write_raw = &adis16136_write_raw,
diff --git a/drivers/iio/gyro/adis16260.c b/drivers/iio/gyro/adis16260.c
index 7da8825f4791..a8cb1ca349d9 100644
--- a/drivers/iio/gyro/adis16260.c
+++ b/drivers/iio/gyro/adis16260.c
@@ -321,7 +321,6 @@ static const struct iio_info adis16260_info = {
.read_raw = &adis16260_read_raw,
.write_raw = &adis16260_write_raw,
.update_scan_mode = adis_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static const char * const adis1620_status_error_msgs[] = {
diff --git a/drivers/iio/gyro/adxrs450.c b/drivers/iio/gyro/adxrs450.c
index a330d4288bb0..5d39fd008378 100644
--- a/drivers/iio/gyro/adxrs450.c
+++ b/drivers/iio/gyro/adxrs450.c
@@ -405,7 +405,6 @@ static const struct iio_chan_spec adxrs450_channels[2][2] = {
};
static const struct iio_info adxrs450_info = {
- .driver_module = THIS_MODULE,
.read_raw = &adxrs450_read_raw,
.write_raw = &adxrs450_write_raw,
};
diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c
index 821919dd245b..15046172e437 100644
--- a/drivers/iio/gyro/bmg160_core.c
+++ b/drivers/iio/gyro/bmg160_core.c
@@ -858,7 +858,6 @@ static const struct iio_info bmg160_info = {
.write_event_value = bmg160_write_event,
.write_event_config = bmg160_write_event_config,
.read_event_config = bmg160_read_event_config,
- .driver_module = THIS_MODULE,
};
static const unsigned long bmg160_accel_scan_masks[] = {
@@ -956,7 +955,6 @@ static int bmg160_data_rdy_trigger_set_state(struct iio_trigger *trig,
static const struct iio_trigger_ops bmg160_trigger_ops = {
.set_trigger_state = bmg160_data_rdy_trigger_set_state,
.try_reenable = bmg160_trig_try_reen,
- .owner = THIS_MODULE,
};
static irqreturn_t bmg160_event_handler(int irq, void *private)
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
index c67ce2ac4715..f59995a90387 100644
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
@@ -186,7 +186,6 @@ static int gyro_3d_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info gyro_3d_info = {
- .driver_module = THIS_MODULE,
.read_raw = &gyro_3d_read_raw,
.write_raw = &gyro_3d_write_raw,
};
diff --git a/drivers/iio/gyro/itg3200_buffer.c b/drivers/iio/gyro/itg3200_buffer.c
index eef50e91f17c..59770e5b6660 100644
--- a/drivers/iio/gyro/itg3200_buffer.c
+++ b/drivers/iio/gyro/itg3200_buffer.c
@@ -101,7 +101,6 @@ static int itg3200_data_rdy_trigger_set_state(struct iio_trigger *trig,
}
static const struct iio_trigger_ops itg3200_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = &itg3200_data_rdy_trigger_set_state,
};
diff --git a/drivers/iio/gyro/itg3200_core.c b/drivers/iio/gyro/itg3200_core.c
index cfa2db04a8ab..7adecb562c81 100644
--- a/drivers/iio/gyro/itg3200_core.c
+++ b/drivers/iio/gyro/itg3200_core.c
@@ -278,7 +278,6 @@ static const struct iio_chan_spec itg3200_channels[] = {
static const struct iio_info itg3200_info = {
.read_raw = &itg3200_read_raw,
.write_raw = &itg3200_write_raw,
- .driver_module = THIS_MODULE,
};
static const unsigned long itg3200_available_scan_masks[] = { 0xffffffff, 0x0 };
diff --git a/drivers/iio/gyro/mpu3050-core.c b/drivers/iio/gyro/mpu3050-core.c
index 2be2a5d287e6..b0fcd80435f3 100644
--- a/drivers/iio/gyro/mpu3050-core.c
+++ b/drivers/iio/gyro/mpu3050-core.c
@@ -742,7 +742,6 @@ static const struct attribute_group mpu3050_attribute_group = {
};
static const struct iio_info mpu3050_info = {
- .driver_module = THIS_MODULE,
.read_raw = mpu3050_read_raw,
.write_raw = mpu3050_write_raw,
.attrs = &mpu3050_attribute_group,
@@ -1032,7 +1031,6 @@ static int mpu3050_drdy_trigger_set_state(struct iio_trigger *trig,
}
static const struct iio_trigger_ops mpu3050_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = mpu3050_drdy_trigger_set_state,
};
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index 2a42b3d583e8..25ac9df78cc4 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -325,7 +325,6 @@ static const struct attribute_group st_gyro_attribute_group = {
};
static const struct iio_info gyro_info = {
- .driver_module = THIS_MODULE,
.attrs = &st_gyro_attribute_group,
.read_raw = &st_gyro_read_raw,
.write_raw = &st_gyro_write_raw,
@@ -334,7 +333,6 @@ static const struct iio_info gyro_info = {
#ifdef CONFIG_IIO_TRIGGER
static const struct iio_trigger_ops st_gyro_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = ST_GYRO_TRIGGER_SET_STATE,
.validate_device = st_sensors_validate_device,
};
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 14/38] iio:health: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (12 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 13/38] iio:gyro: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 15/38] iio:humidity: " Jonathan Cameron
` (23 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/health/afe4403.c | 2 --
drivers/iio/health/afe4404.c | 2 --
drivers/iio/health/max30100.c | 1 -
drivers/iio/health/max30102.c | 1 -
4 files changed, 6 deletions(-)
diff --git a/drivers/iio/health/afe4403.c b/drivers/iio/health/afe4403.c
index 6bb23a49e81e..a739fff01c6b 100644
--- a/drivers/iio/health/afe4403.c
+++ b/drivers/iio/health/afe4403.c
@@ -309,7 +309,6 @@ static const struct iio_info afe4403_iio_info = {
.attrs = &afe440x_attribute_group,
.read_raw = afe4403_read_raw,
.write_raw = afe4403_write_raw,
- .driver_module = THIS_MODULE,
};
static irqreturn_t afe4403_trigger_handler(int irq, void *private)
@@ -354,7 +353,6 @@ static irqreturn_t afe4403_trigger_handler(int irq, void *private)
}
static const struct iio_trigger_ops afe4403_trigger_ops = {
- .owner = THIS_MODULE,
};
#define AFE4403_TIMING_PAIRS \
diff --git a/drivers/iio/health/afe4404.c b/drivers/iio/health/afe4404.c
index 964f5231a831..11910922e655 100644
--- a/drivers/iio/health/afe4404.c
+++ b/drivers/iio/health/afe4404.c
@@ -328,7 +328,6 @@ static const struct iio_info afe4404_iio_info = {
.attrs = &afe440x_attribute_group,
.read_raw = afe4404_read_raw,
.write_raw = afe4404_write_raw,
- .driver_module = THIS_MODULE,
};
static irqreturn_t afe4404_trigger_handler(int irq, void *private)
@@ -355,7 +354,6 @@ static irqreturn_t afe4404_trigger_handler(int irq, void *private)
}
static const struct iio_trigger_ops afe4404_trigger_ops = {
- .owner = THIS_MODULE,
};
/* Default timings from data-sheet */
diff --git a/drivers/iio/health/max30100.c b/drivers/iio/health/max30100.c
index 849d71747f9f..91aef5df24a1 100644
--- a/drivers/iio/health/max30100.c
+++ b/drivers/iio/health/max30100.c
@@ -420,7 +420,6 @@ static int max30100_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info max30100_info = {
- .driver_module = THIS_MODULE,
.read_raw = max30100_read_raw,
};
diff --git a/drivers/iio/health/max30102.c b/drivers/iio/health/max30102.c
index 839b875c29b9..203ffb9cad6a 100644
--- a/drivers/iio/health/max30102.c
+++ b/drivers/iio/health/max30102.c
@@ -381,7 +381,6 @@ static int max30102_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info max30102_info = {
- .driver_module = THIS_MODULE,
.read_raw = max30102_read_raw,
};
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 15/38] iio:humidity: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (13 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 14/38] iio:health: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 16/38] iio:imu: " Jonathan Cameron
` (22 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/humidity/am2315.c | 1 -
drivers/iio/humidity/dht11.c | 1 -
drivers/iio/humidity/hdc100x.c | 1 -
drivers/iio/humidity/hid-sensor-humidity.c | 1 -
drivers/iio/humidity/hts221_buffer.c | 1 -
drivers/iio/humidity/hts221_core.c | 1 -
drivers/iio/humidity/htu21.c | 1 -
drivers/iio/humidity/si7005.c | 1 -
drivers/iio/humidity/si7020.c | 1 -
9 files changed, 9 deletions(-)
diff --git a/drivers/iio/humidity/am2315.c b/drivers/iio/humidity/am2315.c
index ff96b6d0fdae..7d8669dc6547 100644
--- a/drivers/iio/humidity/am2315.c
+++ b/drivers/iio/humidity/am2315.c
@@ -215,7 +215,6 @@ static int am2315_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info am2315_info = {
- .driver_module = THIS_MODULE,
.read_raw = am2315_read_raw,
};
diff --git a/drivers/iio/humidity/dht11.c b/drivers/iio/humidity/dht11.c
index 2a22ad920333..df6bab40d6fa 100644
--- a/drivers/iio/humidity/dht11.c
+++ b/drivers/iio/humidity/dht11.c
@@ -284,7 +284,6 @@ static int dht11_read_raw(struct iio_dev *iio_dev,
}
static const struct iio_info dht11_iio_info = {
- .driver_module = THIS_MODULE,
.read_raw = dht11_read_raw,
};
diff --git a/drivers/iio/humidity/hdc100x.c b/drivers/iio/humidity/hdc100x.c
index aa17115f54c9..2f3bf15895c9 100644
--- a/drivers/iio/humidity/hdc100x.c
+++ b/drivers/iio/humidity/hdc100x.c
@@ -351,7 +351,6 @@ static const struct iio_info hdc100x_info = {
.read_raw = hdc100x_read_raw,
.write_raw = hdc100x_write_raw,
.attrs = &hdc100x_attribute_group,
- .driver_module = THIS_MODULE,
};
static int hdc100x_probe(struct i2c_client *client,
diff --git a/drivers/iio/humidity/hid-sensor-humidity.c b/drivers/iio/humidity/hid-sensor-humidity.c
index 6e09c1acfe51..beab6d6fd6e1 100644
--- a/drivers/iio/humidity/hid-sensor-humidity.c
+++ b/drivers/iio/humidity/hid-sensor-humidity.c
@@ -125,7 +125,6 @@ static int humidity_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info humidity_info = {
- .driver_module = THIS_MODULE,
.read_raw = &humidity_read_raw,
.write_raw = &humidity_write_raw,
};
diff --git a/drivers/iio/humidity/hts221_buffer.c b/drivers/iio/humidity/hts221_buffer.c
index 7d19a3da7ab7..29bc92bdd9cc 100644
--- a/drivers/iio/humidity/hts221_buffer.c
+++ b/drivers/iio/humidity/hts221_buffer.c
@@ -35,7 +35,6 @@ static int hts221_trig_set_state(struct iio_trigger *trig, bool state)
}
static const struct iio_trigger_ops hts221_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = hts221_trig_set_state,
};
diff --git a/drivers/iio/humidity/hts221_core.c b/drivers/iio/humidity/hts221_core.c
index a56da3999e00..a31162de10d4 100644
--- a/drivers/iio/humidity/hts221_core.c
+++ b/drivers/iio/humidity/hts221_core.c
@@ -623,7 +623,6 @@ static const struct attribute_group hts221_attribute_group = {
};
static const struct iio_info hts221_info = {
- .driver_module = THIS_MODULE,
.attrs = &hts221_attribute_group,
.read_raw = hts221_read_raw,
.write_raw = hts221_write_raw,
diff --git a/drivers/iio/humidity/htu21.c b/drivers/iio/humidity/htu21.c
index 0fbbd8c40894..1a847c82203c 100644
--- a/drivers/iio/humidity/htu21.c
+++ b/drivers/iio/humidity/htu21.c
@@ -175,7 +175,6 @@ static const struct iio_info htu21_info = {
.read_raw = htu21_read_raw,
.write_raw = htu21_write_raw,
.attrs = &htu21_attribute_group,
- .driver_module = THIS_MODULE,
};
static int htu21_probe(struct i2c_client *client,
diff --git a/drivers/iio/humidity/si7005.c b/drivers/iio/humidity/si7005.c
index 6297766e93d0..1fd19f035a5d 100644
--- a/drivers/iio/humidity/si7005.c
+++ b/drivers/iio/humidity/si7005.c
@@ -124,7 +124,6 @@ static const struct iio_chan_spec si7005_channels[] = {
static const struct iio_info si7005_info = {
.read_raw = si7005_read_raw,
- .driver_module = THIS_MODULE,
};
static int si7005_probe(struct i2c_client *client,
diff --git a/drivers/iio/humidity/si7020.c b/drivers/iio/humidity/si7020.c
index 345a7656c5ef..1b2ec8df1a72 100644
--- a/drivers/iio/humidity/si7020.c
+++ b/drivers/iio/humidity/si7020.c
@@ -108,7 +108,6 @@ static const struct iio_chan_spec si7020_channels[] = {
static const struct iio_info si7020_info = {
.read_raw = si7020_read_raw,
- .driver_module = THIS_MODULE,
};
static int si7020_probe(struct i2c_client *client,
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 16/38] iio:imu: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (14 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 15/38] iio:humidity: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 17/38] iio:light: " Jonathan Cameron
` (21 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/imu/adis16400_core.c | 1 -
drivers/iio/imu/adis16480.c | 1 -
drivers/iio/imu/adis_trigger.c | 1 -
drivers/iio/imu/bmi160/bmi160_core.c | 1 -
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 1 -
drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 1 -
drivers/iio/imu/kmx61.c | 3 ---
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 --
8 files changed, 11 deletions(-)
diff --git a/drivers/iio/imu/adis16400_core.c b/drivers/iio/imu/adis16400_core.c
index fb7c0dbed51c..283a16070e3a 100644
--- a/drivers/iio/imu/adis16400_core.c
+++ b/drivers/iio/imu/adis16400_core.c
@@ -833,7 +833,6 @@ static struct adis16400_chip_info adis16400_chips[] = {
};
static const struct iio_info adis16400_info = {
- .driver_module = THIS_MODULE,
.read_raw = &adis16400_read_raw,
.write_raw = &adis16400_write_raw,
.update_scan_mode = adis16400_update_scan_mode,
diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
index 8cf84d3488b2..440c1580160c 100644
--- a/drivers/iio/imu/adis16480.c
+++ b/drivers/iio/imu/adis16480.c
@@ -720,7 +720,6 @@ static const struct iio_info adis16480_info = {
.read_raw = &adis16480_read_raw,
.write_raw = &adis16480_write_raw,
.update_scan_mode = adis_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static int adis16480_stop_device(struct iio_dev *indio_dev)
diff --git a/drivers/iio/imu/adis_trigger.c b/drivers/iio/imu/adis_trigger.c
index f53e9a803a0e..0dd5a381be64 100644
--- a/drivers/iio/imu/adis_trigger.c
+++ b/drivers/iio/imu/adis_trigger.c
@@ -25,7 +25,6 @@ static int adis_data_rdy_trigger_set_state(struct iio_trigger *trig,
}
static const struct iio_trigger_ops adis_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = &adis_data_rdy_trigger_set_state,
};
diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
index cfd225ed1c8d..c85659ca9507 100644
--- a/drivers/iio/imu/bmi160/bmi160_core.c
+++ b/drivers/iio/imu/bmi160/bmi160_core.c
@@ -482,7 +482,6 @@ static const struct attribute_group bmi160_attrs_group = {
};
static const struct iio_info bmi160_info = {
- .driver_module = THIS_MODULE,
.read_raw = bmi160_read_raw,
.write_raw = bmi160_write_raw,
.attrs = &bmi160_attrs_group,
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index 96dabbd2f004..8fafe2891de0 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -755,7 +755,6 @@ static const struct attribute_group inv_attribute_group = {
};
static const struct iio_info mpu_info = {
- .driver_module = THIS_MODULE,
.read_raw = &inv_mpu6050_read_raw,
.write_raw = &inv_mpu6050_write_raw,
.write_raw_get_fmt = &inv_write_raw_get_fmt,
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
index e8818d4dd4b8..8359bcb56177 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
@@ -107,7 +107,6 @@ static int inv_mpu_data_rdy_trigger_set_state(struct iio_trigger *trig,
}
static const struct iio_trigger_ops inv_mpu_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = &inv_mpu_data_rdy_trigger_set_state,
};
diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c
index 2e7dd5754a56..44b3f5397343 100644
--- a/drivers/iio/imu/kmx61.c
+++ b/drivers/iio/imu/kmx61.c
@@ -1003,7 +1003,6 @@ static int kmx61_mag_validate_trigger(struct iio_dev *indio_dev,
}
static const struct iio_info kmx61_acc_info = {
- .driver_module = THIS_MODULE,
.read_raw = kmx61_read_raw,
.write_raw = kmx61_write_raw,
.attrs = &kmx61_acc_attribute_group,
@@ -1015,7 +1014,6 @@ static const struct iio_info kmx61_acc_info = {
};
static const struct iio_info kmx61_mag_info = {
- .driver_module = THIS_MODULE,
.read_raw = kmx61_read_raw,
.write_raw = kmx61_write_raw,
.attrs = &kmx61_mag_attribute_group,
@@ -1087,7 +1085,6 @@ static int kmx61_trig_try_reenable(struct iio_trigger *trig)
static const struct iio_trigger_ops kmx61_trigger_ops = {
.set_trigger_state = kmx61_data_rdy_trigger_set_state,
.try_reenable = kmx61_trig_try_reenable,
- .owner = THIS_MODULE,
};
static irqreturn_t kmx61_event_handler(int irq, void *private)
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
index b485540da89e..d45d714acdd3 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
@@ -530,7 +530,6 @@ static const struct attribute_group st_lsm6dsx_acc_attribute_group = {
};
static const struct iio_info st_lsm6dsx_acc_info = {
- .driver_module = THIS_MODULE,
.attrs = &st_lsm6dsx_acc_attribute_group,
.read_raw = st_lsm6dsx_read_raw,
.write_raw = st_lsm6dsx_write_raw,
@@ -548,7 +547,6 @@ static const struct attribute_group st_lsm6dsx_gyro_attribute_group = {
};
static const struct iio_info st_lsm6dsx_gyro_info = {
- .driver_module = THIS_MODULE,
.attrs = &st_lsm6dsx_gyro_attribute_group,
.read_raw = st_lsm6dsx_read_raw,
.write_raw = st_lsm6dsx_write_raw,
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 17/38] iio:light: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (15 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 16/38] iio:imu: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 18/38] iio:magnetometer: " Jonathan Cameron
` (20 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/light/acpi-als.c | 1 -
drivers/iio/light/adjd_s311.c | 1 -
drivers/iio/light/al3320a.c | 1 -
drivers/iio/light/apds9300.c | 2 --
drivers/iio/light/apds9960.c | 1 -
drivers/iio/light/bh1750.c | 1 -
drivers/iio/light/bh1780.c | 1 -
drivers/iio/light/cm32181.c | 1 -
drivers/iio/light/cm3232.c | 1 -
drivers/iio/light/cm3323.c | 1 -
drivers/iio/light/cm3605.c | 1 -
drivers/iio/light/cm36651.c | 1 -
drivers/iio/light/cros_ec_light_prox.c | 1 -
drivers/iio/light/gp2ap020a00f.c | 2 --
drivers/iio/light/hid-sensor-als.c | 1 -
drivers/iio/light/hid-sensor-prox.c | 1 -
drivers/iio/light/isl29018.c | 2 --
drivers/iio/light/isl29028.c | 1 -
drivers/iio/light/isl29125.c | 1 -
drivers/iio/light/jsa1212.c | 1 -
drivers/iio/light/lm3533-als.c | 1 -
drivers/iio/light/ltr501.c | 4 ----
drivers/iio/light/max44000.c | 1 -
drivers/iio/light/opt3001.c | 1 -
drivers/iio/light/pa12203001.c | 1 -
drivers/iio/light/rpr0521.c | 1 -
drivers/iio/light/si1145.c | 3 ---
drivers/iio/light/stk3310.c | 1 -
drivers/iio/light/tcs3414.c | 1 -
drivers/iio/light/tcs3472.c | 1 -
drivers/iio/light/tsl2563.c | 2 --
drivers/iio/light/tsl2583.c | 1 -
drivers/iio/light/tsl4531.c | 1 -
drivers/iio/light/us5182d.c | 1 -
drivers/iio/light/vcnl4000.c | 1 -
drivers/iio/light/veml6070.c | 1 -
drivers/iio/light/vl6180.c | 1 -
37 files changed, 46 deletions(-)
diff --git a/drivers/iio/light/acpi-als.c b/drivers/iio/light/acpi-als.c
index f0b47c501f4e..c35e2f8df339 100644
--- a/drivers/iio/light/acpi-als.c
+++ b/drivers/iio/light/acpi-als.c
@@ -171,7 +171,6 @@ static int acpi_als_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info acpi_als_info = {
- .driver_module = THIS_MODULE,
.read_raw = acpi_als_read_raw,
};
diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
index 0113fc843a81..e45bb6a277c2 100644
--- a/drivers/iio/light/adjd_s311.c
+++ b/drivers/iio/light/adjd_s311.c
@@ -245,7 +245,6 @@ static const struct iio_info adjd_s311_info = {
.read_raw = adjd_s311_read_raw,
.write_raw = adjd_s311_write_raw,
.update_scan_mode = adjd_s311_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static int adjd_s311_probe(struct i2c_client *client,
diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
index 6aac6513fd41..66623facea9a 100644
--- a/drivers/iio/light/al3320a.c
+++ b/drivers/iio/light/al3320a.c
@@ -168,7 +168,6 @@ static int al3320a_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info al3320a_info = {
- .driver_module = THIS_MODULE,
.read_raw = al3320a_read_raw,
.write_raw = al3320a_write_raw,
.attrs = &al3320a_attribute_group,
diff --git a/drivers/iio/light/apds9300.c b/drivers/iio/light/apds9300.c
index 649b26f67813..d283005a294b 100644
--- a/drivers/iio/light/apds9300.c
+++ b/drivers/iio/light/apds9300.c
@@ -337,12 +337,10 @@ static int apds9300_write_interrupt_config(struct iio_dev *indio_dev,
}
static const struct iio_info apds9300_info_no_irq = {
- .driver_module = THIS_MODULE,
.read_raw = apds9300_read_raw,
};
static const struct iio_info apds9300_info = {
- .driver_module = THIS_MODULE,
.read_raw = apds9300_read_raw,
.read_event_value = apds9300_read_thresh,
.write_event_value = apds9300_write_thresh,
diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c
index 518a47e9377b..a8fa00e31c39 100644
--- a/drivers/iio/light/apds9960.c
+++ b/drivers/iio/light/apds9960.c
@@ -744,7 +744,6 @@ static int apds9960_write_event_config(struct iio_dev *indio_dev,
}
static const struct iio_info apds9960_info = {
- .driver_module = THIS_MODULE,
.attrs = &apds9960_attribute_group,
.read_raw = apds9960_read_raw,
.write_raw = apds9960_write_raw,
diff --git a/drivers/iio/light/bh1750.c b/drivers/iio/light/bh1750.c
index 6c61187e630f..a814828e69f5 100644
--- a/drivers/iio/light/bh1750.c
+++ b/drivers/iio/light/bh1750.c
@@ -217,7 +217,6 @@ static const struct attribute_group bh1750_attribute_group = {
};
static const struct iio_info bh1750_info = {
- .driver_module = THIS_MODULE,
.attrs = &bh1750_attribute_group,
.read_raw = bh1750_read_raw,
.write_raw = bh1750_write_raw,
diff --git a/drivers/iio/light/bh1780.c b/drivers/iio/light/bh1780.c
index b54dcba05a82..036f3bbe323c 100644
--- a/drivers/iio/light/bh1780.c
+++ b/drivers/iio/light/bh1780.c
@@ -128,7 +128,6 @@ static int bh1780_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info bh1780_info = {
- .driver_module = THIS_MODULE,
.read_raw = bh1780_read_raw,
.debugfs_reg_access = bh1780_debugfs_reg_access,
};
diff --git a/drivers/iio/light/cm32181.c b/drivers/iio/light/cm32181.c
index d6fd0dace74f..aebf7dd071af 100644
--- a/drivers/iio/light/cm32181.c
+++ b/drivers/iio/light/cm32181.c
@@ -292,7 +292,6 @@ static const struct attribute_group cm32181_attribute_group = {
};
static const struct iio_info cm32181_info = {
- .driver_module = THIS_MODULE,
.read_raw = &cm32181_read_raw,
.write_raw = &cm32181_write_raw,
.attrs = &cm32181_attribute_group,
diff --git a/drivers/iio/light/cm3232.c b/drivers/iio/light/cm3232.c
index 263e97235ea0..c639cf276ee6 100644
--- a/drivers/iio/light/cm3232.c
+++ b/drivers/iio/light/cm3232.c
@@ -322,7 +322,6 @@ static const struct attribute_group cm3232_attribute_group = {
};
static const struct iio_info cm3232_info = {
- .driver_module = THIS_MODULE,
.read_raw = &cm3232_read_raw,
.write_raw = &cm3232_write_raw,
.attrs = &cm3232_attribute_group,
diff --git a/drivers/iio/light/cm3323.c b/drivers/iio/light/cm3323.c
index d823c112d54b..83b08b6dc60f 100644
--- a/drivers/iio/light/cm3323.c
+++ b/drivers/iio/light/cm3323.c
@@ -211,7 +211,6 @@ static int cm3323_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info cm3323_info = {
- .driver_module = THIS_MODULE,
.read_raw = cm3323_read_raw,
.write_raw = cm3323_write_raw,
.attrs = &cm3323_attribute_group,
diff --git a/drivers/iio/light/cm3605.c b/drivers/iio/light/cm3605.c
index 980624e9ffb5..e454bc6a33c6 100644
--- a/drivers/iio/light/cm3605.c
+++ b/drivers/iio/light/cm3605.c
@@ -126,7 +126,6 @@ static int cm3605_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info cm3605_info = {
- .driver_module = THIS_MODULE,
.read_raw = cm3605_read_raw,
};
diff --git a/drivers/iio/light/cm36651.c b/drivers/iio/light/cm36651.c
index 9d66e89c57ef..1dd8ed0121b3 100644
--- a/drivers/iio/light/cm36651.c
+++ b/drivers/iio/light/cm36651.c
@@ -612,7 +612,6 @@ static const struct attribute_group cm36651_attribute_group = {
};
static const struct iio_info cm36651_info = {
- .driver_module = THIS_MODULE,
.read_raw = &cm36651_read_raw,
.write_raw = &cm36651_write_raw,
.read_event_value = &cm36651_read_prox_thresh,
diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c
index 721722376fd0..b2a46b390d5c 100644
--- a/drivers/iio/light/cros_ec_light_prox.c
+++ b/drivers/iio/light/cros_ec_light_prox.c
@@ -175,7 +175,6 @@ static int cros_ec_light_prox_write(struct iio_dev *indio_dev,
static const struct iio_info cros_ec_light_prox_info = {
.read_raw = &cros_ec_light_prox_read,
.write_raw = &cros_ec_light_prox_write,
- .driver_module = THIS_MODULE,
};
static int cros_ec_light_prox_probe(struct platform_device *pdev)
diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a00f.c
index 6ada9149f142..44b13fbcd093 100644
--- a/drivers/iio/light/gp2ap020a00f.c
+++ b/drivers/iio/light/gp2ap020a00f.c
@@ -1384,7 +1384,6 @@ static const struct iio_info gp2ap020a00f_info = {
.read_event_config = &gp2ap020a00f_read_event_config,
.write_event_value = &gp2ap020a00f_write_event_val,
.write_event_config = &gp2ap020a00f_write_event_config,
- .driver_module = THIS_MODULE,
};
static int gp2ap020a00f_buffer_postenable(struct iio_dev *indio_dev)
@@ -1481,7 +1480,6 @@ static const struct iio_buffer_setup_ops gp2ap020a00f_buffer_setup_ops = {
};
static const struct iio_trigger_ops gp2ap020a00f_trigger_ops = {
- .owner = THIS_MODULE,
};
static int gp2ap020a00f_probe(struct i2c_client *client,
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index 059d964772c7..befd693a4a31 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -177,7 +177,6 @@ static int als_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info als_info = {
- .driver_module = THIS_MODULE,
.read_raw = &als_read_raw,
.write_raw = &als_write_raw,
};
diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c
index 73fced8a63b7..45107f7537b5 100644
--- a/drivers/iio/light/hid-sensor-prox.c
+++ b/drivers/iio/light/hid-sensor-prox.c
@@ -156,7 +156,6 @@ static int prox_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info prox_info = {
- .driver_module = THIS_MODULE,
.read_raw = &prox_read_raw,
.write_raw = &prox_write_raw,
};
diff --git a/drivers/iio/light/isl29018.c b/drivers/iio/light/isl29018.c
index 61f5924b472d..b45400f8fef4 100644
--- a/drivers/iio/light/isl29018.c
+++ b/drivers/iio/light/isl29018.c
@@ -624,14 +624,12 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
static const struct iio_info isl29018_info = {
.attrs = &isl29018_group,
- .driver_module = THIS_MODULE,
.read_raw = isl29018_read_raw,
.write_raw = isl29018_write_raw,
};
static const struct iio_info isl29023_info = {
.attrs = &isl29023_group,
- .driver_module = THIS_MODULE,
.read_raw = isl29018_read_raw,
.write_raw = isl29018_write_raw,
};
diff --git a/drivers/iio/light/isl29028.c b/drivers/iio/light/isl29028.c
index 3d09c1fc4dad..f9912ab4f65c 100644
--- a/drivers/iio/light/isl29028.c
+++ b/drivers/iio/light/isl29028.c
@@ -536,7 +536,6 @@ static const struct iio_chan_spec isl29028_channels[] = {
static const struct iio_info isl29028_info = {
.attrs = &isl29108_group,
- .driver_module = THIS_MODULE,
.read_raw = isl29028_read_raw,
.write_raw = isl29028_write_raw,
};
diff --git a/drivers/iio/light/isl29125.c b/drivers/iio/light/isl29125.c
index 1d2c0c8a1d4f..ed38edcd5efe 100644
--- a/drivers/iio/light/isl29125.c
+++ b/drivers/iio/light/isl29125.c
@@ -214,7 +214,6 @@ static const struct iio_info isl29125_info = {
.read_raw = isl29125_read_raw,
.write_raw = isl29125_write_raw,
.attrs = &isl29125_attribute_group,
- .driver_module = THIS_MODULE,
};
static int isl29125_buffer_preenable(struct iio_dev *indio_dev)
diff --git a/drivers/iio/light/jsa1212.c b/drivers/iio/light/jsa1212.c
index e8a8931b4f50..811505d925b3 100644
--- a/drivers/iio/light/jsa1212.c
+++ b/drivers/iio/light/jsa1212.c
@@ -271,7 +271,6 @@ static const struct iio_chan_spec jsa1212_channels[] = {
};
static const struct iio_info jsa1212_info = {
- .driver_module = THIS_MODULE,
.read_raw = &jsa1212_read_raw,
};
diff --git a/drivers/iio/light/lm3533-als.c b/drivers/iio/light/lm3533-als.c
index 0443fd2e8757..36208a3652e9 100644
--- a/drivers/iio/light/lm3533-als.c
+++ b/drivers/iio/light/lm3533-als.c
@@ -827,7 +827,6 @@ static int lm3533_als_disable(struct lm3533_als *als)
static const struct iio_info lm3533_als_info = {
.attrs = &lm3533_als_attribute_group,
.event_attrs = &lm3533_als_event_attribute_group,
- .driver_module = THIS_MODULE,
.read_raw = &lm3533_als_read_raw,
};
diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c
index b30e0c1c6cc4..0c9dee9910a6 100644
--- a/drivers/iio/light/ltr501.c
+++ b/drivers/iio/light/ltr501.c
@@ -1158,7 +1158,6 @@ static const struct iio_info ltr501_info_no_irq = {
.read_raw = ltr501_read_raw,
.write_raw = ltr501_write_raw,
.attrs = <r501_attribute_group,
- .driver_module = THIS_MODULE,
};
static const struct iio_info ltr501_info = {
@@ -1169,14 +1168,12 @@ static const struct iio_info ltr501_info = {
.write_event_value = <r501_write_event,
.read_event_config = <r501_read_event_config,
.write_event_config = <r501_write_event_config,
- .driver_module = THIS_MODULE,
};
static const struct iio_info ltr301_info_no_irq = {
.read_raw = ltr501_read_raw,
.write_raw = ltr501_write_raw,
.attrs = <r301_attribute_group,
- .driver_module = THIS_MODULE,
};
static const struct iio_info ltr301_info = {
@@ -1187,7 +1184,6 @@ static const struct iio_info ltr301_info = {
.write_event_value = <r501_write_event,
.read_event_config = <r501_read_event_config,
.write_event_config = <r501_write_event_config,
- .driver_module = THIS_MODULE,
};
static struct ltr501_chip_info ltr501_chip_info_tbl[] = {
diff --git a/drivers/iio/light/max44000.c b/drivers/iio/light/max44000.c
index 81bd8e8da4a6..bcdb0eb9e537 100644
--- a/drivers/iio/light/max44000.c
+++ b/drivers/iio/light/max44000.c
@@ -402,7 +402,6 @@ static const struct attribute_group max44000_attribute_group = {
};
static const struct iio_info max44000_info = {
- .driver_module = THIS_MODULE,
.read_raw = max44000_read_raw,
.write_raw = max44000_write_raw,
.write_raw_get_fmt = max44000_write_raw_get_fmt,
diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c
index b91ebc3483ce..54d88b60e303 100644
--- a/drivers/iio/light/opt3001.c
+++ b/drivers/iio/light/opt3001.c
@@ -585,7 +585,6 @@ static int opt3001_write_event_config(struct iio_dev *iio,
}
static const struct iio_info opt3001_info = {
- .driver_module = THIS_MODULE,
.attrs = &opt3001_attribute_group,
.read_raw = opt3001_read_raw,
.write_raw = opt3001_write_raw,
diff --git a/drivers/iio/light/pa12203001.c b/drivers/iio/light/pa12203001.c
index 76a9e12b46bc..30ea1a088dd9 100644
--- a/drivers/iio/light/pa12203001.c
+++ b/drivers/iio/light/pa12203001.c
@@ -306,7 +306,6 @@ static int pa12203001_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info pa12203001_info = {
- .driver_module = THIS_MODULE,
.read_raw = pa12203001_read_raw,
.write_raw = pa12203001_write_raw,
.attrs = &pa12203001_attr_group,
diff --git a/drivers/iio/light/rpr0521.c b/drivers/iio/light/rpr0521.c
index 9d0c2e859bb2..2da2dd7d3543 100644
--- a/drivers/iio/light/rpr0521.c
+++ b/drivers/iio/light/rpr0521.c
@@ -576,7 +576,6 @@ static int rpr0521_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info rpr0521_info = {
- .driver_module = THIS_MODULE,
.read_raw = rpr0521_read_raw,
.write_raw = rpr0521_write_raw,
.attrs = &rpr0521_attribute_group,
diff --git a/drivers/iio/light/si1145.c b/drivers/iio/light/si1145.c
index 096034c126a4..76f16f9c7616 100644
--- a/drivers/iio/light/si1145.c
+++ b/drivers/iio/light/si1145.c
@@ -989,14 +989,12 @@ static const struct attribute_group si114x_attribute_group = {
static const struct iio_info si1132_info = {
.read_raw = si1145_read_raw,
.write_raw = si1145_write_raw,
- .driver_module = THIS_MODULE,
.attrs = &si1132_attribute_group,
};
static const struct iio_info si114x_info = {
.read_raw = si1145_read_raw,
.write_raw = si1145_write_raw,
- .driver_module = THIS_MODULE,
.attrs = &si114x_attribute_group,
};
@@ -1237,7 +1235,6 @@ static int si1145_trigger_set_state(struct iio_trigger *trig, bool state)
}
static const struct iio_trigger_ops si1145_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = si1145_trigger_set_state,
};
diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
index 45cf8b0a4363..6e2a169da950 100644
--- a/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@ -409,7 +409,6 @@ static int stk3310_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info stk3310_info = {
- .driver_module = THIS_MODULE,
.read_raw = stk3310_read_raw,
.write_raw = stk3310_write_raw,
.attrs = &stk3310_attribute_group,
diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c
index a795afb7667b..205e5659ce6b 100644
--- a/drivers/iio/light/tcs3414.c
+++ b/drivers/iio/light/tcs3414.c
@@ -241,7 +241,6 @@ static const struct iio_info tcs3414_info = {
.read_raw = tcs3414_read_raw,
.write_raw = tcs3414_write_raw,
.attrs = &tcs3414_attribute_group,
- .driver_module = THIS_MODULE,
};
static int tcs3414_buffer_preenable(struct iio_dev *indio_dev)
diff --git a/drivers/iio/light/tcs3472.c b/drivers/iio/light/tcs3472.c
index 3aa71e34ae28..e1f0e43f1f37 100644
--- a/drivers/iio/light/tcs3472.c
+++ b/drivers/iio/light/tcs3472.c
@@ -244,7 +244,6 @@ static const struct iio_info tcs3472_info = {
.read_raw = tcs3472_read_raw,
.write_raw = tcs3472_write_raw,
.attrs = &tcs3472_attribute_group,
- .driver_module = THIS_MODULE,
};
static int tcs3472_probe(struct i2c_client *client,
diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c
index e7d4ea75e007..6a52b47cb49a 100644
--- a/drivers/iio/light/tsl2563.c
+++ b/drivers/iio/light/tsl2563.c
@@ -697,13 +697,11 @@ static int tsl2563_read_interrupt_config(struct iio_dev *indio_dev,
}
static const struct iio_info tsl2563_info_no_irq = {
- .driver_module = THIS_MODULE,
.read_raw = &tsl2563_read_raw,
.write_raw = &tsl2563_write_raw,
};
static const struct iio_info tsl2563_info = {
- .driver_module = THIS_MODULE,
.read_raw = &tsl2563_read_raw,
.write_raw = &tsl2563_write_raw,
.read_event_value = &tsl2563_read_thresh,
diff --git a/drivers/iio/light/tsl2583.c b/drivers/iio/light/tsl2583.c
index 1679181d2bdd..5d5bc0b7341a 100644
--- a/drivers/iio/light/tsl2583.c
+++ b/drivers/iio/light/tsl2583.c
@@ -804,7 +804,6 @@ static int tsl2583_write_raw(struct iio_dev *indio_dev,
static const struct iio_info tsl2583_info = {
.attrs = &tsl2583_attribute_group,
- .driver_module = THIS_MODULE,
.read_raw = tsl2583_read_raw,
.write_raw = tsl2583_write_raw,
};
diff --git a/drivers/iio/light/tsl4531.c b/drivers/iio/light/tsl4531.c
index cf94ec72b181..06171cb76e23 100644
--- a/drivers/iio/light/tsl4531.c
+++ b/drivers/iio/light/tsl4531.c
@@ -144,7 +144,6 @@ static const struct iio_info tsl4531_info = {
.read_raw = tsl4531_read_raw,
.write_raw = tsl4531_write_raw,
.attrs = &tsl4531_attribute_group,
- .driver_module = THIS_MODULE,
};
static int tsl4531_check_id(struct i2c_client *client)
diff --git a/drivers/iio/light/us5182d.c b/drivers/iio/light/us5182d.c
index d571ad7291ed..68e52943879a 100644
--- a/drivers/iio/light/us5182d.c
+++ b/drivers/iio/light/us5182d.c
@@ -714,7 +714,6 @@ static int us5182d_write_event_config(struct iio_dev *indio_dev,
}
static const struct iio_info us5182d_info = {
- .driver_module = THIS_MODULE,
.read_raw = us5182d_read_raw,
.write_raw = us5182d_write_raw,
.attrs = &us5182d_attr_group,
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index 360b6e98137a..c599a90506ad 100644
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -155,7 +155,6 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev,
static const struct iio_info vcnl4000_info = {
.read_raw = vcnl4000_read_raw,
- .driver_module = THIS_MODULE,
};
static int vcnl4000_probe(struct i2c_client *client,
diff --git a/drivers/iio/light/veml6070.c b/drivers/iio/light/veml6070.c
index bc1c4cb782cd..f4bf3c5b5eda 100644
--- a/drivers/iio/light/veml6070.c
+++ b/drivers/iio/light/veml6070.c
@@ -136,7 +136,6 @@ static int veml6070_read_raw(struct iio_dev *indio_dev,
static const struct iio_info veml6070_info = {
.read_raw = veml6070_read_raw,
- .driver_module = THIS_MODULE,
};
static int veml6070_probe(struct i2c_client *client,
diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c
index 6e25b724d941..2306967f574f 100644
--- a/drivers/iio/light/vl6180.c
+++ b/drivers/iio/light/vl6180.c
@@ -429,7 +429,6 @@ static const struct iio_info vl6180_info = {
.read_raw = vl6180_read_raw,
.write_raw = vl6180_write_raw,
.attrs = &vl6180_attribute_group,
- .driver_module = THIS_MODULE,
};
static int vl6180_init(struct vl6180_data *data)
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 18/38] iio:magnetometer: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (16 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 17/38] iio:light: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 19/38] iio:orientation: drop assign iio_info.driver_module Jonathan Cameron
` (19 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/magnetometer/ak8974.c | 1 -
drivers/iio/magnetometer/ak8975.c | 1 -
drivers/iio/magnetometer/bmc150_magn.c | 2 --
drivers/iio/magnetometer/hid-sensor-magn-3d.c | 1 -
drivers/iio/magnetometer/hmc5843_core.c | 1 -
drivers/iio/magnetometer/mag3110.c | 1 -
drivers/iio/magnetometer/mmc35240.c | 1 -
drivers/iio/magnetometer/st_magn_core.c | 2 --
8 files changed, 10 deletions(-)
diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c
index e13370dc9b1c..6b773e0e3215 100644
--- a/drivers/iio/magnetometer/ak8974.c
+++ b/drivers/iio/magnetometer/ak8974.c
@@ -568,7 +568,6 @@ static const unsigned long ak8974_scan_masks[] = { 0x7, 0 };
static const struct iio_info ak8974_info = {
.read_raw = &ak8974_read_raw,
- .driver_module = THIS_MODULE,
};
static bool ak8974_writeable_reg(struct device *dev, unsigned int reg)
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index 825369fb1c57..1571d542edda 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -781,7 +781,6 @@ static const unsigned long ak8975_scan_masks[] = { 0x7, 0 };
static const struct iio_info ak8975_info = {
.read_raw = &ak8975_read_raw,
- .driver_module = THIS_MODULE,
};
static const struct acpi_device_id ak_acpi_match[] = {
diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c
index d104fb8d9379..d91cb845e3d6 100644
--- a/drivers/iio/magnetometer/bmc150_magn.c
+++ b/drivers/iio/magnetometer/bmc150_magn.c
@@ -651,7 +651,6 @@ static const struct iio_info bmc150_magn_info = {
.attrs = &bmc150_magn_attrs_group,
.read_raw = bmc150_magn_read_raw,
.write_raw = bmc150_magn_write_raw,
- .driver_module = THIS_MODULE,
};
static const unsigned long bmc150_magn_scan_masks[] = {
@@ -811,7 +810,6 @@ static int bmc150_magn_data_rdy_trigger_set_state(struct iio_trigger *trig,
static const struct iio_trigger_ops bmc150_magn_trigger_ops = {
.set_trigger_state = bmc150_magn_data_rdy_trigger_set_state,
.try_reenable = bmc150_magn_trig_try_reen,
- .owner = THIS_MODULE,
};
static int bmc150_magn_buffer_preenable(struct iio_dev *indio_dev)
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index 0e791b02ed4a..a1fd9d591818 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -282,7 +282,6 @@ static int magn_3d_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info magn_3d_info = {
- .driver_module = THIS_MODULE,
.read_raw = &magn_3d_read_raw,
.write_raw = &magn_3d_write_raw,
};
diff --git a/drivers/iio/magnetometer/hmc5843_core.c b/drivers/iio/magnetometer/hmc5843_core.c
index ba3e2a374ee5..ada142fb7aa3 100644
--- a/drivers/iio/magnetometer/hmc5843_core.c
+++ b/drivers/iio/magnetometer/hmc5843_core.c
@@ -597,7 +597,6 @@ static const struct iio_info hmc5843_info = {
.read_raw = &hmc5843_read_raw,
.write_raw = &hmc5843_write_raw,
.write_raw_get_fmt = &hmc5843_write_raw_get_fmt,
- .driver_module = THIS_MODULE,
};
static const unsigned long hmc5843_scan_masks[] = {0x7, 0};
diff --git a/drivers/iio/magnetometer/mag3110.c b/drivers/iio/magnetometer/mag3110.c
index dad8d57f7402..b34ace76d31b 100644
--- a/drivers/iio/magnetometer/mag3110.c
+++ b/drivers/iio/magnetometer/mag3110.c
@@ -333,7 +333,6 @@ static const struct iio_info mag3110_info = {
.attrs = &mag3110_group,
.read_raw = &mag3110_read_raw,
.write_raw = &mag3110_write_raw,
- .driver_module = THIS_MODULE,
};
static const unsigned long mag3110_scan_masks[] = {0x7, 0xf, 0};
diff --git a/drivers/iio/magnetometer/mmc35240.c b/drivers/iio/magnetometer/mmc35240.c
index 176e14a61558..6b640c6338c9 100644
--- a/drivers/iio/magnetometer/mmc35240.c
+++ b/drivers/iio/magnetometer/mmc35240.c
@@ -418,7 +418,6 @@ static int mmc35240_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info mmc35240_info = {
- .driver_module = THIS_MODULE,
.read_raw = mmc35240_read_raw,
.write_raw = mmc35240_write_raw,
.attrs = &mmc35240_attribute_group,
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 8e1b0861fbe4..92ad36b8c7a6 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -435,7 +435,6 @@ static const struct attribute_group st_magn_attribute_group = {
};
static const struct iio_info magn_info = {
- .driver_module = THIS_MODULE,
.attrs = &st_magn_attribute_group,
.read_raw = &st_magn_read_raw,
.write_raw = &st_magn_write_raw,
@@ -444,7 +443,6 @@ static const struct iio_info magn_info = {
#ifdef CONFIG_IIO_TRIGGER
static const struct iio_trigger_ops st_magn_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = ST_MAGN_TRIGGER_SET_STATE,
.validate_device = st_sensors_validate_device,
};
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 19/38] iio:orientation: drop assign iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (17 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 18/38] iio:magnetometer: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 20/38] iio:dpot: " Jonathan Cameron
` (18 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of this is now done via macro magic when
the relevant register call is made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/orientation/hid-sensor-incl-3d.c | 1 -
drivers/iio/orientation/hid-sensor-rotation.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/iio/orientation/hid-sensor-incl-3d.c b/drivers/iio/orientation/hid-sensor-incl-3d.c
index fd1b3696ee42..1e5451d1ff88 100644
--- a/drivers/iio/orientation/hid-sensor-incl-3d.c
+++ b/drivers/iio/orientation/hid-sensor-incl-3d.c
@@ -186,7 +186,6 @@ static int incl_3d_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info incl_3d_info = {
- .driver_module = THIS_MODULE,
.read_raw = &incl_3d_read_raw,
.write_raw = &incl_3d_write_raw,
};
diff --git a/drivers/iio/orientation/hid-sensor-rotation.c b/drivers/iio/orientation/hid-sensor-rotation.c
index e9fa86c87db5..257a06a724a4 100644
--- a/drivers/iio/orientation/hid-sensor-rotation.c
+++ b/drivers/iio/orientation/hid-sensor-rotation.c
@@ -138,7 +138,6 @@ static int dev_rot_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info dev_rot_info = {
- .driver_module = THIS_MODULE,
.read_raw_multi = &dev_rot_read_raw,
.write_raw = &dev_rot_write_raw,
};
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 20/38] iio:dpot: drop assign iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (18 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 19/38] iio:orientation: drop assign iio_info.driver_module Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 21/38] iio:potentiostat:lmp91000 drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
` (17 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of this is now done via macro magic when
the relevant register call is made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/potentiometer/ds1803.c | 1 -
drivers/iio/potentiometer/max5481.c | 1 -
drivers/iio/potentiometer/max5487.c | 1 -
drivers/iio/potentiometer/mcp4131.c | 1 -
drivers/iio/potentiometer/mcp4531.c | 1 -
drivers/iio/potentiometer/tpl0102.c | 1 -
6 files changed, 6 deletions(-)
diff --git a/drivers/iio/potentiometer/ds1803.c b/drivers/iio/potentiometer/ds1803.c
index fb9e2a337dc2..9b0ff4ab2f9c 100644
--- a/drivers/iio/potentiometer/ds1803.c
+++ b/drivers/iio/potentiometer/ds1803.c
@@ -110,7 +110,6 @@ static int ds1803_write_raw(struct iio_dev *indio_dev,
static const struct iio_info ds1803_info = {
.read_raw = ds1803_read_raw,
.write_raw = ds1803_write_raw,
- .driver_module = THIS_MODULE,
};
static int ds1803_probe(struct i2c_client *client,
diff --git a/drivers/iio/potentiometer/max5481.c b/drivers/iio/potentiometer/max5481.c
index 926554991244..2f9102544d57 100644
--- a/drivers/iio/potentiometer/max5481.c
+++ b/drivers/iio/potentiometer/max5481.c
@@ -119,7 +119,6 @@ static int max5481_write_raw(struct iio_dev *indio_dev,
static const struct iio_info max5481_info = {
.read_raw = max5481_read_raw,
.write_raw = max5481_write_raw,
- .driver_module = THIS_MODULE,
};
#if defined(CONFIG_OF)
diff --git a/drivers/iio/potentiometer/max5487.c b/drivers/iio/potentiometer/max5487.c
index 6c50939a2e83..ec1a91a0a391 100644
--- a/drivers/iio/potentiometer/max5487.c
+++ b/drivers/iio/potentiometer/max5487.c
@@ -83,7 +83,6 @@ static int max5487_write_raw(struct iio_dev *indio_dev,
static const struct iio_info max5487_info = {
.read_raw = max5487_read_raw,
.write_raw = max5487_write_raw,
- .driver_module = THIS_MODULE,
};
static int max5487_spi_probe(struct spi_device *spi)
diff --git a/drivers/iio/potentiometer/mcp4131.c b/drivers/iio/potentiometer/mcp4131.c
index 4e7e2c6c522c..b3e30db246cc 100644
--- a/drivers/iio/potentiometer/mcp4131.c
+++ b/drivers/iio/potentiometer/mcp4131.c
@@ -237,7 +237,6 @@ static int mcp4131_write_raw(struct iio_dev *indio_dev,
static const struct iio_info mcp4131_info = {
.read_raw = mcp4131_read_raw,
.write_raw = mcp4131_write_raw,
- .driver_module = THIS_MODULE,
};
static int mcp4131_probe(struct spi_device *spi)
diff --git a/drivers/iio/potentiometer/mcp4531.c b/drivers/iio/potentiometer/mcp4531.c
index 314353d7ab59..114ab876fcc6 100644
--- a/drivers/iio/potentiometer/mcp4531.c
+++ b/drivers/iio/potentiometer/mcp4531.c
@@ -207,7 +207,6 @@ static const struct iio_info mcp4531_info = {
.read_raw = mcp4531_read_raw,
.read_avail = mcp4531_read_avail,
.write_raw = mcp4531_write_raw,
- .driver_module = THIS_MODULE,
};
#ifdef CONFIG_OF
diff --git a/drivers/iio/potentiometer/tpl0102.c b/drivers/iio/potentiometer/tpl0102.c
index 7b6b54531ea2..93f9d4a8c9aa 100644
--- a/drivers/iio/potentiometer/tpl0102.c
+++ b/drivers/iio/potentiometer/tpl0102.c
@@ -106,7 +106,6 @@ static int tpl0102_write_raw(struct iio_dev *indio_dev,
static const struct iio_info tpl0102_info = {
.read_raw = tpl0102_read_raw,
.write_raw = tpl0102_write_raw,
- .driver_module = THIS_MODULE,
};
static int tpl0102_probe(struct i2c_client *client,
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 21/38] iio:potentiostat:lmp91000 drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (19 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 20/38] iio:dpot: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 22/38] iio:pressure: " Jonathan Cameron
` (16 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/potentiostat/lmp91000.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/iio/potentiostat/lmp91000.c b/drivers/iio/potentiostat/lmp91000.c
index afa8de3418d0..007710991f15 100644
--- a/drivers/iio/potentiostat/lmp91000.c
+++ b/drivers/iio/potentiostat/lmp91000.c
@@ -207,7 +207,6 @@ static int lmp91000_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info lmp91000_info = {
- .driver_module = THIS_MODULE,
.read_raw = lmp91000_read_raw,
};
@@ -283,7 +282,6 @@ static int lmp91000_buffer_cb(const void *val, void *private)
}
static const struct iio_trigger_ops lmp91000_trigger_ops = {
- .owner = THIS_MODULE,
};
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 22/38] iio:pressure: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (20 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 21/38] iio:potentiostat:lmp91000 drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 23/38] iio:proximity: " Jonathan Cameron
` (15 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/pressure/abp060mg.c | 1 -
drivers/iio/pressure/bmp280-core.c | 1 -
drivers/iio/pressure/cros_ec_baro.c | 1 -
drivers/iio/pressure/hid-sensor-press.c | 1 -
drivers/iio/pressure/hp03.c | 1 -
drivers/iio/pressure/hp206c.c | 1 -
drivers/iio/pressure/mpl115.c | 1 -
drivers/iio/pressure/mpl3115.c | 1 -
drivers/iio/pressure/ms5611_core.c | 1 -
drivers/iio/pressure/ms5637.c | 1 -
drivers/iio/pressure/st_pressure_core.c | 2 --
drivers/iio/pressure/t5403.c | 1 -
drivers/iio/pressure/zpa2326.c | 2 --
13 files changed, 15 deletions(-)
diff --git a/drivers/iio/pressure/abp060mg.c b/drivers/iio/pressure/abp060mg.c
index 43bdd0b9155f..46a220c70d6a 100644
--- a/drivers/iio/pressure/abp060mg.c
+++ b/drivers/iio/pressure/abp060mg.c
@@ -168,7 +168,6 @@ static int abp060mg_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info abp060mg_info = {
- .driver_module = THIS_MODULE,
.read_raw = abp060mg_read_raw,
};
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index d82b788374b6..89696b70231a 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -546,7 +546,6 @@ static const struct attribute_group bmp280_attrs_group = {
};
static const struct iio_info bmp280_info = {
- .driver_module = THIS_MODULE,
.read_raw = &bmp280_read_raw,
.write_raw = &bmp280_write_raw,
.attrs = &bmp280_attrs_group,
diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c
index 48b2a30f57ae..37034188ab8e 100644
--- a/drivers/iio/pressure/cros_ec_baro.c
+++ b/drivers/iio/pressure/cros_ec_baro.c
@@ -120,7 +120,6 @@ static int cros_ec_baro_write(struct iio_dev *indio_dev,
static const struct iio_info cros_ec_baro_info = {
.read_raw = &cros_ec_baro_read,
.write_raw = &cros_ec_baro_write,
- .driver_module = THIS_MODULE,
};
static int cros_ec_baro_probe(struct platform_device *pdev)
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c
index 6848d8c80eff..4c437918f1d2 100644
--- a/drivers/iio/pressure/hid-sensor-press.c
+++ b/drivers/iio/pressure/hid-sensor-press.c
@@ -160,7 +160,6 @@ static int press_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info press_info = {
- .driver_module = THIS_MODULE,
.read_raw = &press_read_raw,
.write_raw = &press_write_raw,
};
diff --git a/drivers/iio/pressure/hp03.c b/drivers/iio/pressure/hp03.c
index 8c7b3ec3d84a..406934ea6228 100644
--- a/drivers/iio/pressure/hp03.c
+++ b/drivers/iio/pressure/hp03.c
@@ -208,7 +208,6 @@ static int hp03_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info hp03_info = {
- .driver_module = THIS_MODULE,
.read_raw = &hp03_read_raw,
};
diff --git a/drivers/iio/pressure/hp206c.c b/drivers/iio/pressure/hp206c.c
index 12f769e86355..c38c19678cf6 100644
--- a/drivers/iio/pressure/hp206c.c
+++ b/drivers/iio/pressure/hp206c.c
@@ -351,7 +351,6 @@ static const struct iio_info hp206c_info = {
.attrs = &hp206c_attribute_group,
.read_raw = hp206c_read_raw,
.write_raw = hp206c_write_raw,
- .driver_module = THIS_MODULE,
};
static int hp206c_probe(struct i2c_client *client,
diff --git a/drivers/iio/pressure/mpl115.c b/drivers/iio/pressure/mpl115.c
index 8f2bce213248..ab4786d0102b 100644
--- a/drivers/iio/pressure/mpl115.c
+++ b/drivers/iio/pressure/mpl115.c
@@ -144,7 +144,6 @@ static const struct iio_chan_spec mpl115_channels[] = {
static const struct iio_info mpl115_info = {
.read_raw = &mpl115_read_raw,
- .driver_module = THIS_MODULE,
};
int mpl115_probe(struct device *dev, const char *name,
diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c
index 619b963714c7..7537547fb7ee 100644
--- a/drivers/iio/pressure/mpl3115.c
+++ b/drivers/iio/pressure/mpl3115.c
@@ -218,7 +218,6 @@ static const struct iio_chan_spec mpl3115_channels[] = {
static const struct iio_info mpl3115_info = {
.read_raw = &mpl3115_read_raw,
- .driver_module = THIS_MODULE,
};
static int mpl3115_probe(struct i2c_client *client,
diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c
index 2a77a2f15752..f950cfde5db9 100644
--- a/drivers/iio/pressure/ms5611_core.c
+++ b/drivers/iio/pressure/ms5611_core.c
@@ -384,7 +384,6 @@ static const struct iio_info ms5611_info = {
.read_raw = &ms5611_read_raw,
.write_raw = &ms5611_write_raw,
.attrs = &ms5611_attribute_group,
- .driver_module = THIS_MODULE,
};
static int ms5611_init(struct iio_dev *indio_dev)
diff --git a/drivers/iio/pressure/ms5637.c b/drivers/iio/pressure/ms5637.c
index 953ffbc0ef96..7d4f1e8e80d0 100644
--- a/drivers/iio/pressure/ms5637.c
+++ b/drivers/iio/pressure/ms5637.c
@@ -124,7 +124,6 @@ static const struct iio_info ms5637_info = {
.read_raw = ms5637_read_raw,
.write_raw = ms5637_write_raw,
.attrs = &ms5637_attribute_group,
- .driver_module = THIS_MODULE,
};
static int ms5637_probe(struct i2c_client *client,
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index aa61ec15c139..99bcc089a199 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -547,7 +547,6 @@ static const struct attribute_group st_press_attribute_group = {
};
static const struct iio_info press_info = {
- .driver_module = THIS_MODULE,
.attrs = &st_press_attribute_group,
.read_raw = &st_press_read_raw,
.write_raw = &st_press_write_raw,
@@ -556,7 +555,6 @@ static const struct iio_info press_info = {
#ifdef CONFIG_IIO_TRIGGER
static const struct iio_trigger_ops st_press_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = ST_PRESS_TRIGGER_SET_STATE,
.validate_device = st_sensors_validate_device,
};
diff --git a/drivers/iio/pressure/t5403.c b/drivers/iio/pressure/t5403.c
index 2667e71721f5..92c00f603b1d 100644
--- a/drivers/iio/pressure/t5403.c
+++ b/drivers/iio/pressure/t5403.c
@@ -209,7 +209,6 @@ static const struct iio_info t5403_info = {
.read_raw = &t5403_read_raw,
.write_raw = &t5403_write_raw,
.attrs = &t5403_attribute_group,
- .driver_module = THIS_MODULE,
};
static int t5403_probe(struct i2c_client *client,
diff --git a/drivers/iio/pressure/zpa2326.c b/drivers/iio/pressure/zpa2326.c
index c92a95f9f52c..0a55584a4f46 100644
--- a/drivers/iio/pressure/zpa2326.c
+++ b/drivers/iio/pressure/zpa2326.c
@@ -1394,7 +1394,6 @@ static int zpa2326_set_trigger_state(struct iio_trigger *trig, bool state)
}
static const struct iio_trigger_ops zpa2326_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = zpa2326_set_trigger_state,
};
@@ -1594,7 +1593,6 @@ static const struct iio_chan_spec zpa2326_channels[] = {
};
static const struct iio_info zpa2326_info = {
- .driver_module = THIS_MODULE,
.attrs = &zpa2326_attribute_group,
.read_raw = zpa2326_read_raw,
.write_raw = zpa2326_write_raw,
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 23/38] iio:proximity: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (21 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 22/38] iio:pressure: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 24/38] iio:temperature: drop assignment of iio_info.driver_module Jonathan Cameron
` (14 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/proximity/as3935.c | 2 --
drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 1 -
drivers/iio/proximity/srf04.c | 1 -
drivers/iio/proximity/srf08.c | 1 -
drivers/iio/proximity/sx9500.c | 2 --
5 files changed, 7 deletions(-)
diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
index aa0d0be1a608..3b008af2e3aa 100644
--- a/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@ -197,7 +197,6 @@ static int as3935_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info as3935_info = {
- .driver_module = THIS_MODULE,
.attrs = &as3935_attribute_group,
.read_raw = &as3935_read_raw,
};
@@ -223,7 +222,6 @@ static irqreturn_t as3935_trigger_handler(int irq, void *private)
}
static const struct iio_trigger_ops iio_interrupt_trigger_ops = {
- .owner = THIS_MODULE,
};
static void as3935_event_work(struct work_struct *work)
diff --git a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
index 36c1ddc251aa..4d56f67b24c6 100644
--- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
+++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
@@ -249,7 +249,6 @@ static irqreturn_t lidar_trigger_handler(int irq, void *private)
}
static const struct iio_info lidar_info = {
- .driver_module = THIS_MODULE,
.read_raw = lidar_read_raw,
};
diff --git a/drivers/iio/proximity/srf04.c b/drivers/iio/proximity/srf04.c
index e37667f933b3..09c7b9c095b0 100644
--- a/drivers/iio/proximity/srf04.c
+++ b/drivers/iio/proximity/srf04.c
@@ -203,7 +203,6 @@ static int srf04_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info srf04_iio_info = {
- .driver_module = THIS_MODULE,
.read_raw = srf04_read_raw,
};
diff --git a/drivers/iio/proximity/srf08.c b/drivers/iio/proximity/srf08.c
index 49316cbf7c60..ef7bd2b83a0e 100644
--- a/drivers/iio/proximity/srf08.c
+++ b/drivers/iio/proximity/srf08.c
@@ -329,7 +329,6 @@ static const struct iio_chan_spec srf08_channels[] = {
static const struct iio_info srf08_info = {
.read_raw = srf08_read_raw,
.attrs = &srf08_attribute_group,
- .driver_module = THIS_MODULE,
};
static int srf08_probe(struct i2c_client *client,
diff --git a/drivers/iio/proximity/sx9500.c b/drivers/iio/proximity/sx9500.c
index 9ea147f1a50d..6905bd4ed4d5 100644
--- a/drivers/iio/proximity/sx9500.c
+++ b/drivers/iio/proximity/sx9500.c
@@ -615,7 +615,6 @@ static const struct attribute_group sx9500_attribute_group = {
};
static const struct iio_info sx9500_info = {
- .driver_module = THIS_MODULE,
.attrs = &sx9500_attribute_group,
.read_raw = &sx9500_read_raw,
.write_raw = &sx9500_write_raw,
@@ -650,7 +649,6 @@ static int sx9500_set_trigger_state(struct iio_trigger *trig,
static const struct iio_trigger_ops sx9500_trigger_ops = {
.set_trigger_state = sx9500_set_trigger_state,
- .owner = THIS_MODULE,
};
static irqreturn_t sx9500_trigger_handler(int irq, void *private)
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 24/38] iio:temperature: drop assignment of iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (22 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 23/38] iio:proximity: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 25/38] iio:triggers: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
` (13 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of this is now done via macro magic when
the relevant register call is made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/temperature/hid-sensor-temperature.c | 1 -
drivers/iio/temperature/maxim_thermocouple.c | 1 -
drivers/iio/temperature/mlx90614.c | 1 -
drivers/iio/temperature/tmp006.c | 1 -
drivers/iio/temperature/tmp007.c | 1 -
drivers/iio/temperature/tsys01.c | 1 -
drivers/iio/temperature/tsys02d.c | 1 -
7 files changed, 7 deletions(-)
diff --git a/drivers/iio/temperature/hid-sensor-temperature.c b/drivers/iio/temperature/hid-sensor-temperature.c
index c01efeca4002..beaf6fd3e337 100644
--- a/drivers/iio/temperature/hid-sensor-temperature.c
+++ b/drivers/iio/temperature/hid-sensor-temperature.c
@@ -123,7 +123,6 @@ static int temperature_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info temperature_info = {
- .driver_module = THIS_MODULE,
.read_raw = &temperature_read_raw,
.write_raw = &temperature_write_raw,
};
diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c
index d70e2e53d6a7..e8b7e0b6c8ad 100644
--- a/drivers/iio/temperature/maxim_thermocouple.c
+++ b/drivers/iio/temperature/maxim_thermocouple.c
@@ -208,7 +208,6 @@ static int maxim_thermocouple_read_raw(struct iio_dev *indio_dev,
}
static const struct iio_info maxim_thermocouple_info = {
- .driver_module = THIS_MODULE,
.read_raw = maxim_thermocouple_read_raw,
};
diff --git a/drivers/iio/temperature/mlx90614.c b/drivers/iio/temperature/mlx90614.c
index 2077eef4095c..d619e8634a00 100644
--- a/drivers/iio/temperature/mlx90614.c
+++ b/drivers/iio/temperature/mlx90614.c
@@ -400,7 +400,6 @@ static const struct iio_info mlx90614_info = {
.write_raw = mlx90614_write_raw,
.write_raw_get_fmt = mlx90614_write_raw_get_fmt,
.attrs = &mlx90614_attr_group,
- .driver_module = THIS_MODULE,
};
#ifdef CONFIG_PM
diff --git a/drivers/iio/temperature/tmp006.c b/drivers/iio/temperature/tmp006.c
index 18c9b43c02cb..a9b5b7cc7836 100644
--- a/drivers/iio/temperature/tmp006.c
+++ b/drivers/iio/temperature/tmp006.c
@@ -179,7 +179,6 @@ static const struct iio_info tmp006_info = {
.read_raw = tmp006_read_raw,
.write_raw = tmp006_write_raw,
.attrs = &tmp006_attribute_group,
- .driver_module = THIS_MODULE,
};
static bool tmp006_check_identification(struct i2c_client *client)
diff --git a/drivers/iio/temperature/tmp007.c b/drivers/iio/temperature/tmp007.c
index 0615324d054c..0e3f2d432e10 100644
--- a/drivers/iio/temperature/tmp007.c
+++ b/drivers/iio/temperature/tmp007.c
@@ -426,7 +426,6 @@ static const struct iio_info tmp007_info = {
.read_event_value = tmp007_read_thresh,
.write_event_value = tmp007_write_thresh,
.attrs = &tmp007_attribute_group,
- .driver_module = THIS_MODULE,
};
static bool tmp007_identify(struct i2c_client *client)
diff --git a/drivers/iio/temperature/tsys01.c b/drivers/iio/temperature/tsys01.c
index 3e60c6189d98..0f7d025d7fa3 100644
--- a/drivers/iio/temperature/tsys01.c
+++ b/drivers/iio/temperature/tsys01.c
@@ -111,7 +111,6 @@ static const struct iio_chan_spec tsys01_channels[] = {
static const struct iio_info tsys01_info = {
.read_raw = tsys01_read_raw,
- .driver_module = THIS_MODULE,
};
static bool tsys01_crc_valid(u16 *n_prom)
diff --git a/drivers/iio/temperature/tsys02d.c b/drivers/iio/temperature/tsys02d.c
index c0a19a000387..9b2e56fa5fd5 100644
--- a/drivers/iio/temperature/tsys02d.c
+++ b/drivers/iio/temperature/tsys02d.c
@@ -120,7 +120,6 @@ static const struct iio_info tsys02d_info = {
.read_raw = tsys02d_read_raw,
.write_raw = tsys02d_write_raw,
.attrs = &tsys02d_attribute_group,
- .driver_module = THIS_MODULE,
};
static int tsys02d_probe(struct i2c_client *client,
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 25/38] iio:triggers: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (23 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 24/38] iio:temperature: drop assignment of iio_info.driver_module Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 26/38] staging:iio:accel: drop assignment of iio_info.driver_module Jonathan Cameron
` (12 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Note that stm32-timer-trigger has expanded rather beyond triggers
(to include encoder input counting for example) and hence has an
iio_info structure.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/trigger/iio-trig-hrtimer.c | 1 -
drivers/iio/trigger/iio-trig-interrupt.c | 1 -
drivers/iio/trigger/iio-trig-loop.c | 1 -
drivers/iio/trigger/iio-trig-sysfs.c | 1 -
drivers/iio/trigger/stm32-timer-trigger.c | 2 --
5 files changed, 6 deletions(-)
diff --git a/drivers/iio/trigger/iio-trig-hrtimer.c b/drivers/iio/trigger/iio-trig-hrtimer.c
index a1cad6cc2e0f..3ee92160053f 100644
--- a/drivers/iio/trigger/iio-trig-hrtimer.c
+++ b/drivers/iio/trigger/iio-trig-hrtimer.c
@@ -114,7 +114,6 @@ static int iio_trig_hrtimer_set_state(struct iio_trigger *trig, bool state)
}
static const struct iio_trigger_ops iio_hrtimer_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = iio_trig_hrtimer_set_state,
};
diff --git a/drivers/iio/trigger/iio-trig-interrupt.c b/drivers/iio/trigger/iio-trig-interrupt.c
index e18f12b74610..171c4ed03543 100644
--- a/drivers/iio/trigger/iio-trig-interrupt.c
+++ b/drivers/iio/trigger/iio-trig-interrupt.c
@@ -29,7 +29,6 @@ static irqreturn_t iio_interrupt_trigger_poll(int irq, void *private)
}
static const struct iio_trigger_ops iio_interrupt_trigger_ops = {
- .owner = THIS_MODULE,
};
static int iio_interrupt_trigger_probe(struct platform_device *pdev)
diff --git a/drivers/iio/trigger/iio-trig-loop.c b/drivers/iio/trigger/iio-trig-loop.c
index dc6be28f96fe..b4b02dbd6e8a 100644
--- a/drivers/iio/trigger/iio-trig-loop.c
+++ b/drivers/iio/trigger/iio-trig-loop.c
@@ -74,7 +74,6 @@ static int iio_loop_trigger_set_state(struct iio_trigger *trig, bool state)
static const struct iio_trigger_ops iio_loop_trigger_ops = {
.set_trigger_state = iio_loop_trigger_set_state,
- .owner = THIS_MODULE,
};
static struct iio_sw_trigger *iio_trig_loop_probe(const char *name)
diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c
index 202e8b89caf2..3f0dc9a1a514 100644
--- a/drivers/iio/trigger/iio-trig-sysfs.c
+++ b/drivers/iio/trigger/iio-trig-sysfs.c
@@ -127,7 +127,6 @@ static const struct attribute_group *iio_sysfs_trigger_attr_groups[] = {
};
static const struct iio_trigger_ops iio_sysfs_trigger_ops = {
- .owner = THIS_MODULE,
};
static int iio_sysfs_trigger_probe(int id)
diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c
index 0797f2fe584f..9789a43f912a 100644
--- a/drivers/iio/trigger/stm32-timer-trigger.c
+++ b/drivers/iio/trigger/stm32-timer-trigger.c
@@ -318,7 +318,6 @@ static const struct attribute_group *stm32_trigger_attr_groups[] = {
};
static const struct iio_trigger_ops timer_trigger_ops = {
- .owner = THIS_MODULE,
};
static int stm32_setup_iio_triggers(struct stm32_timer_trigger *priv)
@@ -418,7 +417,6 @@ static int stm32_counter_write_raw(struct iio_dev *indio_dev,
}
static const struct iio_info stm32_trigger_info = {
- .driver_module = THIS_MODULE,
.read_raw = stm32_counter_read_raw,
.write_raw = stm32_counter_write_raw
};
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 26/38] staging:iio:accel: drop assignment of iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (24 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 25/38] iio:triggers: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 27/38] staging:iio:adc: drop assign iio_info.driver_module Jonathan Cameron
` (11 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent this is now done via macro magic when
the relevant register call is made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/accel/adis16201.c | 1 -
drivers/staging/iio/accel/adis16203.c | 1 -
drivers/staging/iio/accel/adis16209.c | 1 -
drivers/staging/iio/accel/adis16240.c | 1 -
4 files changed, 4 deletions(-)
diff --git a/drivers/staging/iio/accel/adis16201.c b/drivers/staging/iio/accel/adis16201.c
index fbc240663621..2ebd27536216 100644
--- a/drivers/staging/iio/accel/adis16201.c
+++ b/drivers/staging/iio/accel/adis16201.c
@@ -284,7 +284,6 @@ static const struct iio_info adis16201_info = {
.read_raw = adis16201_read_raw,
.write_raw = adis16201_write_raw,
.update_scan_mode = adis_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static const char * const adis16201_status_error_msgs[] = {
diff --git a/drivers/staging/iio/accel/adis16203.c b/drivers/staging/iio/accel/adis16203.c
index 4e3fa7592d3f..b3e4571340ab 100644
--- a/drivers/staging/iio/accel/adis16203.c
+++ b/drivers/staging/iio/accel/adis16203.c
@@ -232,7 +232,6 @@ static const struct iio_info adis16203_info = {
.read_raw = adis16203_read_raw,
.write_raw = adis16203_write_raw,
.update_scan_mode = adis_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static const char * const adis16203_status_error_msgs[] = {
diff --git a/drivers/staging/iio/accel/adis16209.c b/drivers/staging/iio/accel/adis16209.c
index 8485c024e3f5..7fcef9a2590a 100644
--- a/drivers/staging/iio/accel/adis16209.c
+++ b/drivers/staging/iio/accel/adis16209.c
@@ -285,7 +285,6 @@ static const struct iio_info adis16209_info = {
.read_raw = adis16209_read_raw,
.write_raw = adis16209_write_raw,
.update_scan_mode = adis_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static const char * const adis16209_status_error_msgs[] = {
diff --git a/drivers/staging/iio/accel/adis16240.c b/drivers/staging/iio/accel/adis16240.c
index 109cd94b5ac3..fff6d99089cc 100644
--- a/drivers/staging/iio/accel/adis16240.c
+++ b/drivers/staging/iio/accel/adis16240.c
@@ -361,7 +361,6 @@ static const struct iio_info adis16240_info = {
.read_raw = adis16240_read_raw,
.write_raw = adis16240_write_raw,
.update_scan_mode = adis_update_scan_mode,
- .driver_module = THIS_MODULE,
};
static const char * const adis16240_status_error_msgs[] = {
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 27/38] staging:iio:adc: drop assign iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (25 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 26/38] staging:iio:accel: drop assignment of iio_info.driver_module Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 28/38] staging:iio:cdc: " Jonathan Cameron
` (10 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of this is now done via macro magic when
the relevant register call is made. The actual structure
element will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/adc/ad7192.c | 2 --
drivers/staging/iio/adc/ad7280a.c | 1 -
drivers/staging/iio/adc/ad7606.c | 4 ----
drivers/staging/iio/adc/ad7780.c | 1 -
drivers/staging/iio/adc/ad7816.c | 1 -
drivers/staging/iio/addac/adt7316.c | 2 --
6 files changed, 11 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index d11c6de9c777..d577d7b32c71 100644
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -569,7 +569,6 @@ static const struct iio_info ad7192_info = {
.write_raw_get_fmt = ad7192_write_raw_get_fmt,
.attrs = &ad7192_attribute_group,
.validate_trigger = ad_sd_validate_trigger,
- .driver_module = THIS_MODULE,
};
static const struct iio_info ad7195_info = {
@@ -578,7 +577,6 @@ static const struct iio_info ad7195_info = {
.write_raw_get_fmt = ad7192_write_raw_get_fmt,
.attrs = &ad7195_attribute_group,
.validate_trigger = ad_sd_validate_trigger,
- .driver_module = THIS_MODULE,
};
static const struct iio_chan_spec ad7192_channels[] = {
diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index d5ab83f0236d..858b4b7e366a 100644
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -823,7 +823,6 @@ static const struct iio_info ad7280_info = {
.read_raw = ad7280_read_raw,
.event_attrs = &ad7280_event_attrs_group,
.attrs = &ad7280_attrs_group,
- .driver_module = THIS_MODULE,
};
static const struct ad7280_platform_data ad7793_default_pdata = {
diff --git a/drivers/staging/iio/adc/ad7606.c b/drivers/staging/iio/adc/ad7606.c
index 18f5f139117e..25b9fcd5e3a4 100644
--- a/drivers/staging/iio/adc/ad7606.c
+++ b/drivers/staging/iio/adc/ad7606.c
@@ -373,26 +373,22 @@ static irqreturn_t ad7606_interrupt(int irq, void *dev_id)
};
static const struct iio_info ad7606_info_no_os_or_range = {
- .driver_module = THIS_MODULE,
.read_raw = &ad7606_read_raw,
};
static const struct iio_info ad7606_info_os_and_range = {
- .driver_module = THIS_MODULE,
.read_raw = &ad7606_read_raw,
.write_raw = &ad7606_write_raw,
.attrs = &ad7606_attribute_group_os_and_range,
};
static const struct iio_info ad7606_info_os = {
- .driver_module = THIS_MODULE,
.read_raw = &ad7606_read_raw,
.write_raw = &ad7606_write_raw,
.attrs = &ad7606_attribute_group_os,
};
static const struct iio_info ad7606_info_range = {
- .driver_module = THIS_MODULE,
.read_raw = &ad7606_read_raw,
.write_raw = &ad7606_write_raw,
.attrs = &ad7606_attribute_group_range,
diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c
index dec3ba6eba8a..a7797af579b9 100644
--- a/drivers/staging/iio/adc/ad7780.c
+++ b/drivers/staging/iio/adc/ad7780.c
@@ -155,7 +155,6 @@ static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
static const struct iio_info ad7780_info = {
.read_raw = ad7780_read_raw,
- .driver_module = THIS_MODULE,
};
static int ad7780_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c
index 17d280581e24..bfe180a475ee 100644
--- a/drivers/staging/iio/adc/ad7816.c
+++ b/drivers/staging/iio/adc/ad7816.c
@@ -335,7 +335,6 @@ static const struct attribute_group ad7816_event_attribute_group = {
static const struct iio_info ad7816_info = {
.attrs = &ad7816_attribute_group,
.event_attrs = &ad7816_event_attribute_group,
- .driver_module = THIS_MODULE,
};
/*
diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c
index b2bce26499f5..2d33632c00e8 100644
--- a/drivers/staging/iio/addac/adt7316.c
+++ b/drivers/staging/iio/addac/adt7316.c
@@ -2087,13 +2087,11 @@ EXPORT_SYMBOL_GPL(adt7316_pm_ops);
static const struct iio_info adt7316_info = {
.attrs = &adt7316_attribute_group,
.event_attrs = &adt7316_event_attribute_group,
- .driver_module = THIS_MODULE,
};
static const struct iio_info adt7516_info = {
.attrs = &adt7516_attribute_group,
.event_attrs = &adt7516_event_attribute_group,
- .driver_module = THIS_MODULE,
};
/*
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 28/38] staging:iio:cdc: drop assign iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (26 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 27/38] staging:iio:adc: drop assign iio_info.driver_module Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 29/38] staging:iio:frequency: " Jonathan Cameron
` (9 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of this is now done via macro magic when
the relevant register call is made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/cdc/ad7150.c | 1 -
drivers/staging/iio/cdc/ad7152.c | 1 -
drivers/staging/iio/cdc/ad7746.c | 1 -
3 files changed, 3 deletions(-)
diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c
index a6f249e9c1e1..2fe916c48848 100644
--- a/drivers/staging/iio/cdc/ad7150.c
+++ b/drivers/staging/iio/cdc/ad7150.c
@@ -569,7 +569,6 @@ static const struct attribute_group ad7150_event_attribute_group = {
static const struct iio_info ad7150_info = {
.event_attrs = &ad7150_event_attribute_group,
- .driver_module = THIS_MODULE,
.read_raw = &ad7150_read_raw,
.read_event_config = &ad7150_read_event_config,
.write_event_config = &ad7150_write_event_config,
diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c
index dc6ecd824365..ac7b724ddde5 100644
--- a/drivers/staging/iio/cdc/ad7152.c
+++ b/drivers/staging/iio/cdc/ad7152.c
@@ -445,7 +445,6 @@ static const struct iio_info ad7152_info = {
.read_raw = ad7152_read_raw,
.write_raw = ad7152_write_raw,
.write_raw_get_fmt = ad7152_write_raw_get_fmt,
- .driver_module = THIS_MODULE,
};
static const struct iio_chan_spec ad7152_channels[] = {
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
index cdcb4fccf3fe..a124853a05f0 100644
--- a/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@ -667,7 +667,6 @@ static const struct iio_info ad7746_info = {
.attrs = &ad7746_attribute_group,
.read_raw = ad7746_read_raw,
.write_raw = ad7746_write_raw,
- .driver_module = THIS_MODULE,
};
/*
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 29/38] staging:iio:frequency: drop assign iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (27 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 28/38] staging:iio:cdc: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 30/38] staging:iio:gyro:adis16060 " Jonathan Cameron
` (8 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of this is now done via macro magic when
the relevant register call is made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/frequency/ad9832.c | 1 -
drivers/staging/iio/frequency/ad9834.c | 2 --
2 files changed, 3 deletions(-)
diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
index 6da46ede7ee0..c73eff1f8d73 100644
--- a/drivers/staging/iio/frequency/ad9832.c
+++ b/drivers/staging/iio/frequency/ad9832.c
@@ -290,7 +290,6 @@ static const struct attribute_group ad9832_attribute_group = {
static const struct iio_info ad9832_info = {
.attrs = &ad9832_attribute_group,
- .driver_module = THIS_MODULE,
};
static int ad9832_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c
index 995acdd7c942..4c6d4043903e 100644
--- a/drivers/staging/iio/frequency/ad9834.c
+++ b/drivers/staging/iio/frequency/ad9834.c
@@ -381,12 +381,10 @@ static const struct attribute_group ad9833_attribute_group = {
static const struct iio_info ad9834_info = {
.attrs = &ad9834_attribute_group,
- .driver_module = THIS_MODULE,
};
static const struct iio_info ad9833_info = {
.attrs = &ad9833_attribute_group,
- .driver_module = THIS_MODULE,
};
static int ad9834_probe(struct spi_device *spi)
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 30/38] staging:iio:gyro:adis16060 drop assign iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (28 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 29/38] staging:iio:frequency: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 31/38] staging:iio:ad5933: " Jonathan Cameron
` (7 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of this is now done via macro magic when
the relevant register call is made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/gyro/adis16060_core.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c
index 967524583d8a..4e7630caf7d3 100644
--- a/drivers/staging/iio/gyro/adis16060_core.c
+++ b/drivers/staging/iio/gyro/adis16060_core.c
@@ -103,7 +103,6 @@ static int adis16060_read_raw(struct iio_dev *indio_dev,
static const struct iio_info adis16060_info = {
.read_raw = adis16060_read_raw,
- .driver_module = THIS_MODULE,
};
static const struct iio_chan_spec adis16060_channels[] = {
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 31/38] staging:iio:ad5933: drop assign iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (29 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 30/38] staging:iio:gyro:adis16060 " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 32/38] staging:iio:meter: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
` (6 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of this is now done via macro magic when
the relevant register call is made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/impedance-analyzer/ad5933.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 3d539eeb0e26..2b28fb9c0048 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -575,7 +575,6 @@ static int ad5933_read_raw(struct iio_dev *indio_dev,
static const struct iio_info ad5933_info = {
.read_raw = ad5933_read_raw,
.attrs = &ad5933_attribute_group,
- .driver_module = THIS_MODULE,
};
static int ad5933_ring_preenable(struct iio_dev *indio_dev)
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 32/38] staging:iio:meter: drop assign iio_info.driver_module and iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (30 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 31/38] staging:iio:ad5933: " Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 33/38] iio:resolver: drop assignment of iio_info.driver_module Jonathan Cameron
` (5 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of both of these are now done via macro magic when
the relevant register calls are made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/meter/ade7753.c | 1 -
drivers/staging/iio/meter/ade7754.c | 1 -
drivers/staging/iio/meter/ade7758_core.c | 1 -
drivers/staging/iio/meter/ade7758_trigger.c | 1 -
drivers/staging/iio/meter/ade7759.c | 1 -
drivers/staging/iio/meter/ade7854.c | 1 -
6 files changed, 6 deletions(-)
diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index ce26abdeab92..98993f8b85bf 100644
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -561,7 +561,6 @@ static const struct attribute_group ade7753_attribute_group = {
static const struct iio_info ade7753_info = {
.attrs = &ade7753_attribute_group,
- .driver_module = THIS_MODULE,
};
static int ade7753_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index be0df3fe4230..3a1e342d75fb 100644
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -601,7 +601,6 @@ static const struct attribute_group ade7754_attribute_group = {
static const struct iio_info ade7754_info = {
.attrs = &ade7754_attribute_group,
- .driver_module = THIS_MODULE,
};
static int ade7754_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index 40498af4dc46..7b7ffe5ed186 100644
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -827,7 +827,6 @@ static const struct iio_info ade7758_info = {
.attrs = &ade7758_attribute_group,
.read_raw = &ade7758_read_raw,
.write_raw = &ade7758_write_raw,
- .driver_module = THIS_MODULE,
};
static int ade7758_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/meter/ade7758_trigger.c b/drivers/staging/iio/meter/ade7758_trigger.c
index 5b35a7f08f4f..1f0d1a0cf889 100644
--- a/drivers/staging/iio/meter/ade7758_trigger.c
+++ b/drivers/staging/iio/meter/ade7758_trigger.c
@@ -53,7 +53,6 @@ static int ade7758_trig_try_reen(struct iio_trigger *trig)
}
static const struct iio_trigger_ops ade7758_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = &ade7758_data_rdy_trigger_set_state,
.try_reenable = &ade7758_trig_try_reen,
};
diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c
index 1691760339da..7639e90d1c94 100644
--- a/drivers/staging/iio/meter/ade7759.c
+++ b/drivers/staging/iio/meter/ade7759.c
@@ -493,7 +493,6 @@ static const struct attribute_group ade7759_attribute_group = {
static const struct iio_info ade7759_info = {
.attrs = &ade7759_attribute_group,
- .driver_module = THIS_MODULE,
};
static int ade7759_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/meter/ade7854.c b/drivers/staging/iio/meter/ade7854.c
index 70612da64a8b..90d07cdca4b8 100644
--- a/drivers/staging/iio/meter/ade7854.c
+++ b/drivers/staging/iio/meter/ade7854.c
@@ -530,7 +530,6 @@ static const struct attribute_group ade7854_attribute_group = {
static const struct iio_info ade7854_info = {
.attrs = &ade7854_attribute_group,
- .driver_module = THIS_MODULE,
};
int ade7854_probe(struct iio_dev *indio_dev, struct device *dev)
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 33/38] iio:resolver: drop assignment of iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (31 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 32/38] staging:iio:meter: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 34/38] iio:adc: drop assignment of iio_trigger_ops.owner Jonathan Cameron
` (4 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent is now done via macro magic when
the relevant register call is made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/resolver/ad2s1200.c | 1 -
drivers/staging/iio/resolver/ad2s1210.c | 1 -
drivers/staging/iio/resolver/ad2s90.c | 1 -
3 files changed, 3 deletions(-)
diff --git a/drivers/staging/iio/resolver/ad2s1200.c b/drivers/staging/iio/resolver/ad2s1200.c
index a37e199225f4..aa62c64e9bc4 100644
--- a/drivers/staging/iio/resolver/ad2s1200.c
+++ b/drivers/staging/iio/resolver/ad2s1200.c
@@ -98,7 +98,6 @@ static const struct iio_chan_spec ad2s1200_channels[] = {
static const struct iio_info ad2s1200_info = {
.read_raw = ad2s1200_read_raw,
- .driver_module = THIS_MODULE,
};
static int ad2s1200_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
index a6a8393d6664..e27f559f3535 100644
--- a/drivers/staging/iio/resolver/ad2s1210.c
+++ b/drivers/staging/iio/resolver/ad2s1210.c
@@ -638,7 +638,6 @@ static int ad2s1210_initial(struct ad2s1210_state *st)
static const struct iio_info ad2s1210_info = {
.read_raw = ad2s1210_read_raw,
.attrs = &ad2s1210_attribute_group,
- .driver_module = THIS_MODULE,
};
static int ad2s1210_setup_gpios(struct ad2s1210_state *st)
diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c
index b2270908f26f..59586947a936 100644
--- a/drivers/staging/iio/resolver/ad2s90.c
+++ b/drivers/staging/iio/resolver/ad2s90.c
@@ -48,7 +48,6 @@ static int ad2s90_read_raw(struct iio_dev *indio_dev,
static const struct iio_info ad2s90_info = {
.read_raw = ad2s90_read_raw,
- .driver_module = THIS_MODULE,
};
static const struct iio_chan_spec ad2s90_chan = {
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 34/38] iio:adc: drop assignment of iio_trigger_ops.owner
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (32 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 33/38] iio:resolver: drop assignment of iio_info.driver_module Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 35/38] staging:iio:light:tsl2x7x drop assignment of driver_module Jonathan Cameron
` (3 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent of this is now done via macro magic when
the relevant register call is made. The actual structure
elements will shortly go away.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
index 4e0b4eedb53d..d80dcf82eba9 100644
--- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
+++ b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
@@ -172,7 +172,6 @@ static int iio_bfin_tmr_get_number(int irq)
}
static const struct iio_trigger_ops iio_bfin_tmr_trigger_ops = {
- .owner = THIS_MODULE,
.set_trigger_state = iio_bfin_tmr_set_state,
};
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 35/38] staging:iio:light:tsl2x7x drop assignment of driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (33 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 34/38] iio:adc: drop assignment of iio_trigger_ops.owner Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 36/38] input: tsc2007 - drop the driver_module assignment in iio interface Jonathan Cameron
` (2 subsequent siblings)
37 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalent is now done via macro magic in the register call.
Note this is the only case not found by the coccinelle script
suggesting that perhaps that script needs to be a little more
clever!
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/light/tsl2x7x.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c
index 146719928fb3..3b4bf710da2a 100644
--- a/drivers/staging/iio/light/tsl2x7x.c
+++ b/drivers/staging/iio/light/tsl2x7x.c
@@ -1681,7 +1681,6 @@ static const struct iio_info tsl2X7X_device_info[] = {
[ALS] = {
.attrs = &tsl2X7X_device_attr_group_tbl[ALS],
.event_attrs = &tsl2X7X_event_attr_group_tbl[ALS],
- .driver_module = THIS_MODULE,
.read_raw = &tsl2x7x_read_raw,
.write_raw = &tsl2x7x_write_raw,
.read_event_value = &tsl2x7x_read_thresh,
@@ -1692,7 +1691,6 @@ static const struct iio_info tsl2X7X_device_info[] = {
[PRX] = {
.attrs = &tsl2X7X_device_attr_group_tbl[PRX],
.event_attrs = &tsl2X7X_event_attr_group_tbl[PRX],
- .driver_module = THIS_MODULE,
.read_raw = &tsl2x7x_read_raw,
.write_raw = &tsl2x7x_write_raw,
.read_event_value = &tsl2x7x_read_thresh,
@@ -1703,7 +1701,6 @@ static const struct iio_info tsl2X7X_device_info[] = {
[ALSPRX] = {
.attrs = &tsl2X7X_device_attr_group_tbl[ALSPRX],
.event_attrs = &tsl2X7X_event_attr_group_tbl[ALSPRX],
- .driver_module = THIS_MODULE,
.read_raw = &tsl2x7x_read_raw,
.write_raw = &tsl2x7x_write_raw,
.read_event_value = &tsl2x7x_read_thresh,
@@ -1714,7 +1711,6 @@ static const struct iio_info tsl2X7X_device_info[] = {
[PRX2] = {
.attrs = &tsl2X7X_device_attr_group_tbl[PRX2],
.event_attrs = &tsl2X7X_event_attr_group_tbl[PRX],
- .driver_module = THIS_MODULE,
.read_raw = &tsl2x7x_read_raw,
.write_raw = &tsl2x7x_write_raw,
.read_event_value = &tsl2x7x_read_thresh,
@@ -1725,7 +1721,6 @@ static const struct iio_info tsl2X7X_device_info[] = {
[ALSPRX2] = {
.attrs = &tsl2X7X_device_attr_group_tbl[ALSPRX2],
.event_attrs = &tsl2X7X_event_attr_group_tbl[ALSPRX],
- .driver_module = THIS_MODULE,
.read_raw = &tsl2x7x_read_raw,
.write_raw = &tsl2x7x_write_raw,
.read_event_value = &tsl2x7x_read_thresh,
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 36/38] input: tsc2007 - drop the driver_module assignment in iio interface.
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (34 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 35/38] staging:iio:light:tsl2x7x drop assignment of driver_module Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
[not found] ` <20170529155154.22580-37-jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-05-29 15:51 ` [PATCH 37/38] platform/x86: toshiba_acpi: drop assignment of iio_info.driver_module Jonathan Cameron
2017-05-29 15:51 ` [PATCH 38/38] iio: drop iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
37 siblings, 1 reply; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron, Linux Input, Dmitry Torokhov
This is now handled via some macro magic during the register. The
field in iio_info will be removed shortly.
Cc: Linux Input <linux-input@vger.kernel.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/input/touchscreen/tsc2007_iio.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/input/touchscreen/tsc2007_iio.c b/drivers/input/touchscreen/tsc2007_iio.c
index 27b25a9fce83..e27a956f5f2b 100644
--- a/drivers/input/touchscreen/tsc2007_iio.c
+++ b/drivers/input/touchscreen/tsc2007_iio.c
@@ -104,7 +104,6 @@ static int tsc2007_read_raw(struct iio_dev *indio_dev,
static const struct iio_info tsc2007_iio_info = {
.read_raw = tsc2007_read_raw,
- .driver_module = THIS_MODULE,
};
int tsc2007_iio_configure(struct tsc2007 *ts)
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 37/38] platform/x86: toshiba_acpi: drop assignment of iio_info.driver_module
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (35 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 36/38] input: tsc2007 - drop the driver_module assignment in iio interface Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-05-29 17:56 ` Andy Shevchenko
2017-06-07 14:53 ` Azael Avalos
2017-05-29 15:51 ` [PATCH 38/38] iio: drop iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
37 siblings, 2 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron, Azael Avalos, platform-driver-x86
This is now handled by use of a macro for device registration. The field
in iio_info will be going away shortly as it is no longer used.
Cc: Azael Avalos <coproscefalo@gmail.com>
Cc: <platform-driver-x86@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/platform/x86/toshiba_acpi.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index d0daf75cbed1..ef4301f41727 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -2515,7 +2515,6 @@ static const struct iio_chan_spec toshiba_iio_accel_channels[] = {
};
static const struct iio_info toshiba_iio_accel_info = {
- .driver_module = THIS_MODULE,
.read_raw = &toshiba_iio_accel_read_raw,
};
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 38/38] iio: drop iio_info.driver_module and iio_trigger_ops.owner.
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
` (36 preceding siblings ...)
2017-05-29 15:51 ` [PATCH 37/38] platform/x86: toshiba_acpi: drop assignment of iio_info.driver_module Jonathan Cameron
@ 2017-05-29 15:51 ` Jonathan Cameron
2017-06-12 16:16 ` Lars-Peter Clausen
37 siblings, 1 reply; 48+ messages in thread
From: Jonathan Cameron @ 2017-05-29 15:51 UTC (permalink / raw)
To: linux-iio; +Cc: Jonathan Cameron
The equivalents are now assigned automatically in the relevant
registration calls and so are not needed in these operations
structures.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
include/linux/iio/iio.h | 3 ---
include/linux/iio/trigger.h | 1 -
2 files changed, 4 deletions(-)
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index f65391067089..02c2a78ada5a 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -363,8 +363,6 @@ struct iio_dev;
/**
* struct iio_info - constant information about device
- * @driver_module: module structure used to ensure correct
- * ownership of chrdevs etc
* @event_attrs: event control attributes
* @attrs: general purpose device attributes
* @read_raw: function to request a value from the device.
@@ -419,7 +417,6 @@ struct iio_dev;
* were flushed and there was an error.
**/
struct iio_info {
- struct module *driver_module;
const struct attribute_group *event_attrs;
const struct attribute_group *attrs;
diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
index 2e1800ad265b..ff2b7c7a9652 100644
--- a/include/linux/iio/trigger.h
+++ b/include/linux/iio/trigger.h
@@ -34,7 +34,6 @@ struct iio_trigger;
* instances of a given device.
**/
struct iio_trigger_ops {
- struct module *owner;
int (*set_trigger_state)(struct iio_trigger *trig, bool state);
int (*try_reenable)(struct iio_trigger *trig);
int (*validate_device)(struct iio_trigger *trig,
--
2.13.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* Re: [PATCH 37/38] platform/x86: toshiba_acpi: drop assignment of iio_info.driver_module
2017-05-29 15:51 ` [PATCH 37/38] platform/x86: toshiba_acpi: drop assignment of iio_info.driver_module Jonathan Cameron
@ 2017-05-29 17:56 ` Andy Shevchenko
2017-06-07 14:53 ` Azael Avalos
1 sibling, 0 replies; 48+ messages in thread
From: Andy Shevchenko @ 2017-05-29 17:56 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Azael Avalos, Platform Driver
On Mon, May 29, 2017 at 6:51 PM, Jonathan Cameron <jic23@kernel.org> wrote:
> This is now handled by use of a macro for device registration. The field
> in iio_info will be going away shortly as it is no longer used.
>
> Cc: Azael Avalos <coproscefalo@gmail.com>
> Cc: <platform-driver-x86@vger.kernel.org>
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
> ---
> drivers/platform/x86/toshiba_acpi.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
> index d0daf75cbed1..ef4301f41727 100644
> --- a/drivers/platform/x86/toshiba_acpi.c
> +++ b/drivers/platform/x86/toshiba_acpi.c
> @@ -2515,7 +2515,6 @@ static const struct iio_chan_spec toshiba_iio_accel_channels[] = {
> };
>
> static const struct iio_info toshiba_iio_accel_info = {
> - .driver_module = THIS_MODULE,
> .read_raw = &toshiba_iio_accel_read_raw,
> };
>
> --
> 2.13.0
>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 36/38] input: tsc2007 - drop the driver_module assignment in iio interface.
2017-05-29 15:51 ` [PATCH 36/38] input: tsc2007 - drop the driver_module assignment in iio interface Jonathan Cameron
@ 2017-05-30 2:41 ` Dmitry Torokhov
0 siblings, 0 replies; 48+ messages in thread
From: Dmitry Torokhov @ 2017-05-30 2:41 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio-u79uwXL29TY76Z2rM5mHXA, Linux Input
On Mon, May 29, 2017 at 04:51:52PM +0100, Jonathan Cameron wrote:
> This is now handled via some macro magic during the register. The
> field in iio_info will be removed shortly.
>
> Cc: Linux Input <linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
> Cc: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Signed-off-by: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
It sounds the patch needs something from your tree so please merge it
though there.
Acked-by: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> drivers/input/touchscreen/tsc2007_iio.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/input/touchscreen/tsc2007_iio.c b/drivers/input/touchscreen/tsc2007_iio.c
> index 27b25a9fce83..e27a956f5f2b 100644
> --- a/drivers/input/touchscreen/tsc2007_iio.c
> +++ b/drivers/input/touchscreen/tsc2007_iio.c
> @@ -104,7 +104,6 @@ static int tsc2007_read_raw(struct iio_dev *indio_dev,
>
> static const struct iio_info tsc2007_iio_info = {
> .read_raw = tsc2007_read_raw,
> - .driver_module = THIS_MODULE,
> };
>
> int tsc2007_iio_configure(struct tsc2007 *ts)
> --
> 2.13.0
>
--
Dmitry
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 36/38] input: tsc2007 - drop the driver_module assignment in iio interface.
@ 2017-05-30 2:41 ` Dmitry Torokhov
0 siblings, 0 replies; 48+ messages in thread
From: Dmitry Torokhov @ 2017-05-30 2:41 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Linux Input
On Mon, May 29, 2017 at 04:51:52PM +0100, Jonathan Cameron wrote:
> This is now handled via some macro magic during the register. The
> field in iio_info will be removed shortly.
>
> Cc: Linux Input <linux-input@vger.kernel.org>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
It sounds the patch needs something from your tree so please merge it
though there.
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> drivers/input/touchscreen/tsc2007_iio.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/input/touchscreen/tsc2007_iio.c b/drivers/input/touchscreen/tsc2007_iio.c
> index 27b25a9fce83..e27a956f5f2b 100644
> --- a/drivers/input/touchscreen/tsc2007_iio.c
> +++ b/drivers/input/touchscreen/tsc2007_iio.c
> @@ -104,7 +104,6 @@ static int tsc2007_read_raw(struct iio_dev *indio_dev,
>
> static const struct iio_info tsc2007_iio_info = {
> .read_raw = tsc2007_read_raw,
> - .driver_module = THIS_MODULE,
> };
>
> int tsc2007_iio_configure(struct tsc2007 *ts)
> --
> 2.13.0
>
--
Dmitry
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 01/38] iio: Use macro magic to avoid manual assign of driver_module
2017-05-29 15:51 ` [PATCH 01/38] iio: Use macro magic to avoid manual assign of driver_module Jonathan Cameron
@ 2017-06-03 8:37 ` Jonathan Cameron
2017-06-12 16:13 ` Lars-Peter Clausen
1 sibling, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-06-03 8:37 UTC (permalink / raw)
To: linux-iio, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler
On Mon, 29 May 2017 16:51:17 +0100
Jonathan Cameron <jic23@kernel.org> wrote:
> Starting point in boiler plate reduction similar to that done for
> many similar cases elsewhere in the kernel.
>
> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Hi all,
I've been slightly less lazy than last week and added some cc's.
If any of you lovely people have a bit of time to take a look at
the first two patches in this series that would be great.
I'm definitely looking for a acked-by or reviewed-by on this series
before applying.
Thanks,
Jonathan
> ---
> drivers/iio/industrialio-core.c | 35 +++++++++--------------------------
> drivers/iio/industrialio-trigger.c | 6 +++---
> include/linux/iio/iio.h | 31 +++++++++++++++++++++++++++++--
> 3 files changed, 41 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> index 4a1de59d153a..62dafa4414e3 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -1665,14 +1665,11 @@ static int iio_check_unique_scan_index(struct iio_dev *indio_dev)
>
> static const struct iio_buffer_setup_ops noop_ring_setup_ops;
>
> -/**
> - * iio_device_register() - register a device with the IIO subsystem
> - * @indio_dev: Device structure filled by the device driver
> - **/
> -int iio_device_register(struct iio_dev *indio_dev)
> +int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod)
> {
> int ret;
>
> + indio_dev->driver_module = this_mod;
> /* If the calling driver did not initialize of_node, do it here */
> if (!indio_dev->dev.of_node && indio_dev->dev.parent)
> indio_dev->dev.of_node = indio_dev->dev.parent->of_node;
> @@ -1718,7 +1715,8 @@ int iio_device_register(struct iio_dev *indio_dev)
> indio_dev->setup_ops = &noop_ring_setup_ops;
>
> cdev_init(&indio_dev->chrdev, &iio_buffer_fileops);
> - indio_dev->chrdev.owner = indio_dev->info->driver_module;
> +
> + indio_dev->chrdev.owner = this_mod;
>
> ret = cdev_device_add(&indio_dev->chrdev, &indio_dev->dev);
> if (ret < 0)
> @@ -1736,7 +1734,7 @@ int iio_device_register(struct iio_dev *indio_dev)
> iio_device_unregister_debugfs(indio_dev);
> return ret;
> }
> -EXPORT_SYMBOL(iio_device_register);
> +EXPORT_SYMBOL(__iio_device_register);
>
> /**
> * iio_device_unregister() - unregister a device from the IIO subsystem
> @@ -1768,23 +1766,8 @@ static void devm_iio_device_unreg(struct device *dev, void *res)
> iio_device_unregister(*(struct iio_dev **)res);
> }
>
> -/**
> - * devm_iio_device_register - Resource-managed iio_device_register()
> - * @dev: Device to allocate iio_dev for
> - * @indio_dev: Device structure filled by the device driver
> - *
> - * Managed iio_device_register. The IIO device registered with this
> - * function is automatically unregistered on driver detach. This function
> - * calls iio_device_register() internally. Refer to that function for more
> - * information.
> - *
> - * If an iio_dev registered with this function needs to be unregistered
> - * separately, devm_iio_device_unregister() must be used.
> - *
> - * RETURNS:
> - * 0 on success, negative error number on failure.
> - */
> -int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev)
> +int __devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev,
> + struct module *this_mod)
> {
> struct iio_dev **ptr;
> int ret;
> @@ -1794,7 +1777,7 @@ int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev)
> return -ENOMEM;
>
> *ptr = indio_dev;
> - ret = iio_device_register(indio_dev);
> + ret = __iio_device_register(indio_dev, this_mod);
> if (!ret)
> devres_add(dev, ptr);
> else
> @@ -1802,7 +1785,7 @@ int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev)
>
> return ret;
> }
> -EXPORT_SYMBOL_GPL(devm_iio_device_register);
> +EXPORT_SYMBOL_GPL(__devm_iio_device_register);
>
> /**
> * devm_iio_device_unregister - Resource-managed iio_device_unregister()
> diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
> index 978e1592c2a3..067e58863592 100644
> --- a/drivers/iio/industrialio-trigger.c
> +++ b/drivers/iio/industrialio-trigger.c
> @@ -250,7 +250,7 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
> = bitmap_empty(trig->pool, CONFIG_IIO_CONSUMERS_PER_TRIGGER);
>
> /* Prevent the module from being removed whilst attached to a trigger */
> - __module_get(pf->indio_dev->info->driver_module);
> + __module_get(pf->indio_dev->driver_module);
>
> /* Get irq number */
> pf->irq = iio_trigger_get_irq(trig);
> @@ -286,7 +286,7 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
> out_put_irq:
> iio_trigger_put_irq(trig, pf->irq);
> out_put_module:
> - module_put(pf->indio_dev->info->driver_module);
> + module_put(pf->indio_dev->driver_module);
> return ret;
> }
>
> @@ -307,7 +307,7 @@ static int iio_trigger_detach_poll_func(struct iio_trigger *trig,
> trig->attached_own_device = false;
> iio_trigger_put_irq(trig, pf->irq);
> free_irq(pf->irq, pf);
> - module_put(pf->indio_dev->info->driver_module);
> + module_put(pf->indio_dev->driver_module);
>
> return ret;
> }
> diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
> index 3f5ea2e9a39e..f65391067089 100644
> --- a/include/linux/iio/iio.h
> +++ b/include/linux/iio/iio.h
> @@ -512,6 +512,7 @@ struct iio_buffer_setup_ops {
> /**
> * struct iio_dev - industrial I/O device
> * @id: [INTERN] used to identify device internally
> + * @driver_module: [INTERN] used to make it harder to undercut users
> * @modes: [DRIVER] operating modes supported by device
> * @currentmode: [DRIVER] current operating mode
> * @dev: [DRIVER] device structure, should be assigned a parent
> @@ -552,6 +553,7 @@ struct iio_buffer_setup_ops {
> */
> struct iio_dev {
> int id;
> + struct module *driver_module;
>
> int modes;
> int currentmode;
> @@ -598,9 +600,34 @@ struct iio_dev {
>
> const struct iio_chan_spec
> *iio_find_channel_from_si(struct iio_dev *indio_dev, int si);
> -int iio_device_register(struct iio_dev *indio_dev);
> +/**
> + * iio_device_register() - register a device with the IIO subsystem
> + * @indio_dev: Device structure filled by the device driver
> + **/
> +#define iio_device_register(iio_dev) \
> + __iio_device_register(iio_dev, THIS_MODULE)
> +int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod);
> void iio_device_unregister(struct iio_dev *indio_dev);
> -int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev);
> +/**
> + * devm_iio_device_register - Resource-managed iio_device_register()
> + * @dev: Device to allocate iio_dev for
> + * @indio_dev: Device structure filled by the device driver
> + *
> + * Managed iio_device_register. The IIO device registered with this
> + * function is automatically unregistered on driver detach. This function
> + * calls iio_device_register() internally. Refer to that function for more
> + * information.
> + *
> + * If an iio_dev registered with this function needs to be unregistered
> + * separately, devm_iio_device_unregister() must be used.
> + *
> + * RETURNS:
> + * 0 on success, negative error number on failure.
> + */
> +#define devm_iio_device_register(dev, indio_dev) \
> + __devm_iio_device_register(dev, indio_dev, THIS_MODULE);
> +int __devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev,
> + struct module *this_mod);
> void devm_iio_device_unregister(struct device *dev, struct iio_dev *indio_dev);
> int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp);
> int iio_device_claim_direct_mode(struct iio_dev *indio_dev);
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 37/38] platform/x86: toshiba_acpi: drop assignment of iio_info.driver_module
2017-05-29 15:51 ` [PATCH 37/38] platform/x86: toshiba_acpi: drop assignment of iio_info.driver_module Jonathan Cameron
2017-05-29 17:56 ` Andy Shevchenko
@ 2017-06-07 14:53 ` Azael Avalos
2017-06-11 14:03 ` Jonathan Cameron
1 sibling, 1 reply; 48+ messages in thread
From: Azael Avalos @ 2017-06-07 14:53 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, platform-driver-x86
Sorry for being this late, been a bit busy.
2017-05-29 9:51 GMT-06:00 Jonathan Cameron <jic23@kernel.org>:
> This is now handled by use of a macro for device registration. The field
> in iio_info will be going away shortly as it is no longer used.
>
> Cc: Azael Avalos <coproscefalo@gmail.com>
> Cc: <platform-driver-x86@vger.kernel.org>
Acked-by: Azael Avalos <coproscefalo@gmail.com>
> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
> ---
> drivers/platform/x86/toshiba_acpi.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
> index d0daf75cbed1..ef4301f41727 100644
> --- a/drivers/platform/x86/toshiba_acpi.c
> +++ b/drivers/platform/x86/toshiba_acpi.c
> @@ -2515,7 +2515,6 @@ static const struct iio_chan_spec toshiba_iio_accel_channels[] = {
> };
>
> static const struct iio_info toshiba_iio_accel_info = {
> - .driver_module = THIS_MODULE,
> .read_raw = &toshiba_iio_accel_read_raw,
> };
>
> --
> 2.13.0
>
--
-- El mundo apesta y vosotros apestais tambien --
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 37/38] platform/x86: toshiba_acpi: drop assignment of iio_info.driver_module
2017-06-07 14:53 ` Azael Avalos
@ 2017-06-11 14:03 ` Jonathan Cameron
0 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-06-11 14:03 UTC (permalink / raw)
To: Azael Avalos; +Cc: linux-iio, platform-driver-x86
On Wed, 7 Jun 2017 08:53:09 -0600
Azael Avalos <coproscefalo@gmail.com> wrote:
> Sorry for being this late, been a bit busy.
That's fine, I'm still waiting for reviews on the two core patches
at the start of the series :(
Trying to avoid playing the maintainer game and applying loads
of my own patches without review!
Thanks,
Jonathan
>
> 2017-05-29 9:51 GMT-06:00 Jonathan Cameron <jic23@kernel.org>:
> > This is now handled by use of a macro for device registration. The field
> > in iio_info will be going away shortly as it is no longer used.
> >
> > Cc: Azael Avalos <coproscefalo@gmail.com>
> > Cc: <platform-driver-x86@vger.kernel.org>
>
> Acked-by: Azael Avalos <coproscefalo@gmail.com>
>
> > Signed-off-by: Jonathan Cameron <jic23@kernel.org>
> > ---
> > drivers/platform/x86/toshiba_acpi.c | 1 -
> > 1 file changed, 1 deletion(-)
> >
> > diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
> > index d0daf75cbed1..ef4301f41727 100644
> > --- a/drivers/platform/x86/toshiba_acpi.c
> > +++ b/drivers/platform/x86/toshiba_acpi.c
> > @@ -2515,7 +2515,6 @@ static const struct iio_chan_spec toshiba_iio_accel_channels[] = {
> > };
> >
> > static const struct iio_info toshiba_iio_accel_info = {
> > - .driver_module = THIS_MODULE,
> > .read_raw = &toshiba_iio_accel_read_raw,
> > };
> >
> > --
> > 2.13.0
> >
>
>
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 01/38] iio: Use macro magic to avoid manual assign of driver_module
2017-05-29 15:51 ` [PATCH 01/38] iio: Use macro magic to avoid manual assign of driver_module Jonathan Cameron
2017-06-03 8:37 ` Jonathan Cameron
@ 2017-06-12 16:13 ` Lars-Peter Clausen
1 sibling, 0 replies; 48+ messages in thread
From: Lars-Peter Clausen @ 2017-06-12 16:13 UTC (permalink / raw)
To: Jonathan Cameron, linux-iio
On 05/29/2017 05:51 PM, Jonathan Cameron wrote:
> Starting point in boiler plate reduction similar to that done for
> many similar cases elsewhere in the kernel.
>
> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Sorry for the long delay.
Whole patch series looks sensible.
Although I personally believe we shouldn't grab the owner module at all, but
that is a separate issue.
One small bit inline.
- Lars
> @@ -598,9 +600,34 @@ struct iio_dev {
>
> const struct iio_chan_spec
> *iio_find_channel_from_si(struct iio_dev *indio_dev, int si);
> -int iio_device_register(struct iio_dev *indio_dev);
> +/**
> + * iio_device_register() - register a device with the IIO subsystem
> + * @indio_dev: Device structure filled by the device driver
> + **/
> +#define iio_device_register(iio_dev) \
> + __iio_device_register(iio_dev, THIS_MODULE)
There should be parentheses around iio_dev.
> +int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod);
> void iio_device_unregister(struct iio_dev *indio_dev);
> -int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev);
> +/**
> + * devm_iio_device_register - Resource-managed iio_device_register()
> + * @dev: Device to allocate iio_dev for
> + * @indio_dev: Device structure filled by the device driver
> + *
> + * Managed iio_device_register. The IIO device registered with this
> + * function is automatically unregistered on driver detach. This function
> + * calls iio_device_register() internally. Refer to that function for more
> + * information.
> + *
> + * If an iio_dev registered with this function needs to be unregistered
> + * separately, devm_iio_device_unregister() must be used.
> + *
> + * RETURNS:
> + * 0 on success, negative error number on failure.
> + */
> +#define devm_iio_device_register(dev, indio_dev) \
> + __devm_iio_device_register(dev, indio_dev, THIS_MODULE);
Same here
> +int __devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev,
> + struct module *this_mod);
> void devm_iio_device_unregister(struct device *dev, struct iio_dev *indio_dev);
> int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp);
> int iio_device_claim_direct_mode(struct iio_dev *indio_dev);
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 38/38] iio: drop iio_info.driver_module and iio_trigger_ops.owner.
2017-05-29 15:51 ` [PATCH 38/38] iio: drop iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
@ 2017-06-12 16:16 ` Lars-Peter Clausen
2017-06-24 20:57 ` Jonathan Cameron
0 siblings, 1 reply; 48+ messages in thread
From: Lars-Peter Clausen @ 2017-06-12 16:16 UTC (permalink / raw)
To: Jonathan Cameron, linux-iio
On 05/29/2017 05:51 PM, Jonathan Cameron wrote:
> diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
> index 2e1800ad265b..ff2b7c7a9652 100644
> --- a/include/linux/iio/trigger.h
> +++ b/include/linux/iio/trigger.h
> @@ -34,7 +34,6 @@ struct iio_trigger;
Update to the kernel-doc is missing here.
> * instances of a given device.
> **/
> struct iio_trigger_ops {
> - struct module *owner;
> int (*set_trigger_state)(struct iio_trigger *trig, bool state);
> int (*try_reenable)(struct iio_trigger *trig);
> int (*validate_device)(struct iio_trigger *trig,
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 38/38] iio: drop iio_info.driver_module and iio_trigger_ops.owner.
2017-06-12 16:16 ` Lars-Peter Clausen
@ 2017-06-24 20:57 ` Jonathan Cameron
0 siblings, 0 replies; 48+ messages in thread
From: Jonathan Cameron @ 2017-06-24 20:57 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: linux-iio
On Mon, 12 Jun 2017 18:16:56 +0200
Lars-Peter Clausen <lars@metafoo.de> wrote:
> On 05/29/2017 05:51 PM, Jonathan Cameron wrote:
> > diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
> > index 2e1800ad265b..ff2b7c7a9652 100644
> > --- a/include/linux/iio/trigger.h
> > +++ b/include/linux/iio/trigger.h
> > @@ -34,7 +34,6 @@ struct iio_trigger;
>
> Update to the kernel-doc is missing here.
Just so I don't forget. This patch also needs to remove the
bit of code that insists there is an iio_trigger_ops so that
the owner field can be read.
Will do a new version, perhaps tomorrow.
Thanks,
Jonathan
>
> > * instances of a given device.
> > **/
> > struct iio_trigger_ops {
> > - struct module *owner;
> > int (*set_trigger_state)(struct iio_trigger *trig, bool state);
> > int (*try_reenable)(struct iio_trigger *trig);
> > int (*validate_device)(struct iio_trigger *trig,
> >
>
^ permalink raw reply [flat|nested] 48+ messages in thread
end of thread, other threads:[~2017-06-24 20:57 UTC | newest]
Thread overview: 48+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-29 15:51 [PATCH 00/38] IIO: Drop manual assignment of THIS_MODULE Jonathan Cameron
2017-05-29 15:51 ` [PATCH 01/38] iio: Use macro magic to avoid manual assign of driver_module Jonathan Cameron
2017-06-03 8:37 ` Jonathan Cameron
2017-06-12 16:13 ` Lars-Peter Clausen
2017-05-29 15:51 ` [PATCH 02/38] iio: triggers: Use macros to avoid boilerplate assignment of owner Jonathan Cameron
2017-05-29 15:51 ` [PATCH 03/38] coccinelle: Add an iio_no_owner semantic patch to drop driver_owner Jonathan Cameron
2017-05-29 15:51 ` [PATCH 04/38] iio:adc: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
2017-05-29 15:51 ` [PATCH 05/38] iio:accel: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 06/38] iio:amplifiers:ad8366 " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 07/38] iio:chemical: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 08/38] iio:common: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 09/38] iio:counter:104-quad-8 drop assign iio_info.driver_module Jonathan Cameron
2017-05-29 15:51 ` [PATCH 10/38] iio:dac: drop assignment of iio_info.driver_module Jonathan Cameron
2017-05-29 15:51 ` [PATCH 11/38] iio:dummy: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 12/38] iio:frequency: drop assign iio_info.driver_module Jonathan Cameron
2017-05-29 15:51 ` [PATCH 13/38] iio:gyro: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
2017-05-29 15:51 ` [PATCH 14/38] iio:health: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 15/38] iio:humidity: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 16/38] iio:imu: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 17/38] iio:light: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 18/38] iio:magnetometer: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 19/38] iio:orientation: drop assign iio_info.driver_module Jonathan Cameron
2017-05-29 15:51 ` [PATCH 20/38] iio:dpot: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 21/38] iio:potentiostat:lmp91000 drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
2017-05-29 15:51 ` [PATCH 22/38] iio:pressure: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 23/38] iio:proximity: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 24/38] iio:temperature: drop assignment of iio_info.driver_module Jonathan Cameron
2017-05-29 15:51 ` [PATCH 25/38] iio:triggers: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
2017-05-29 15:51 ` [PATCH 26/38] staging:iio:accel: drop assignment of iio_info.driver_module Jonathan Cameron
2017-05-29 15:51 ` [PATCH 27/38] staging:iio:adc: drop assign iio_info.driver_module Jonathan Cameron
2017-05-29 15:51 ` [PATCH 28/38] staging:iio:cdc: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 29/38] staging:iio:frequency: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 30/38] staging:iio:gyro:adis16060 " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 31/38] staging:iio:ad5933: " Jonathan Cameron
2017-05-29 15:51 ` [PATCH 32/38] staging:iio:meter: drop assign iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
2017-05-29 15:51 ` [PATCH 33/38] iio:resolver: drop assignment of iio_info.driver_module Jonathan Cameron
2017-05-29 15:51 ` [PATCH 34/38] iio:adc: drop assignment of iio_trigger_ops.owner Jonathan Cameron
2017-05-29 15:51 ` [PATCH 35/38] staging:iio:light:tsl2x7x drop assignment of driver_module Jonathan Cameron
2017-05-29 15:51 ` [PATCH 36/38] input: tsc2007 - drop the driver_module assignment in iio interface Jonathan Cameron
[not found] ` <20170529155154.22580-37-jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-05-30 2:41 ` Dmitry Torokhov
2017-05-30 2:41 ` Dmitry Torokhov
2017-05-29 15:51 ` [PATCH 37/38] platform/x86: toshiba_acpi: drop assignment of iio_info.driver_module Jonathan Cameron
2017-05-29 17:56 ` Andy Shevchenko
2017-06-07 14:53 ` Azael Avalos
2017-06-11 14:03 ` Jonathan Cameron
2017-05-29 15:51 ` [PATCH 38/38] iio: drop iio_info.driver_module and iio_trigger_ops.owner Jonathan Cameron
2017-06-12 16:16 ` Lars-Peter Clausen
2017-06-24 20:57 ` Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.