diff options
author | Jonathan Cameron <jic23@kernel.org> | 2017-07-23 12:25:56 -0400 |
---|---|---|
committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2017-08-22 16:28:56 -0400 |
commit | 227e8ef81d6db980184c49e893bb1e7e7432b341 (patch) | |
tree | e1a04eda1163aaa066d9c65a3ae4276a9a1f3fc6 | |
parent | 3b3ec6034152cbf42870d766a1db0c0489c653a4 (diff) |
iio:gyro: drop assign iio_info.driver_module and iio_trigger_ops.owner
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 <Jonathan.Cameron@huawei.com>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
-rw-r--r-- | drivers/iio/gyro/adis16080.c | 1 | ||||
-rw-r--r-- | drivers/iio/gyro/adis16130.c | 1 | ||||
-rw-r--r-- | drivers/iio/gyro/adis16136.c | 1 | ||||
-rw-r--r-- | drivers/iio/gyro/adis16260.c | 1 | ||||
-rw-r--r-- | drivers/iio/gyro/adxrs450.c | 1 | ||||
-rw-r--r-- | drivers/iio/gyro/bmg160_core.c | 2 | ||||
-rw-r--r-- | drivers/iio/gyro/hid-sensor-gyro-3d.c | 1 | ||||
-rw-r--r-- | drivers/iio/gyro/itg3200_buffer.c | 1 | ||||
-rw-r--r-- | drivers/iio/gyro/itg3200_core.c | 1 | ||||
-rw-r--r-- | drivers/iio/gyro/mpu3050-core.c | 2 | ||||
-rw-r--r-- | drivers/iio/gyro/st_gyro_core.c | 2 |
11 files changed, 0 insertions, 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[] = { | |||
163 | 163 | ||
164 | static const struct iio_info adis16080_info = { | 164 | static const struct iio_info adis16080_info = { |
165 | .read_raw = &adis16080_read_raw, | 165 | .read_raw = &adis16080_read_raw, |
166 | .driver_module = THIS_MODULE, | ||
167 | }; | 166 | }; |
168 | 167 | ||
169 | enum { | 168 | 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[] = { | |||
137 | 137 | ||
138 | static const struct iio_info adis16130_info = { | 138 | static const struct iio_info adis16130_info = { |
139 | .read_raw = &adis16130_read_raw, | 139 | .read_raw = &adis16130_read_raw, |
140 | .driver_module = THIS_MODULE, | ||
141 | }; | 140 | }; |
142 | 141 | ||
143 | static int adis16130_probe(struct spi_device *spi) | 142 | 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 = { | |||
398 | }; | 398 | }; |
399 | 399 | ||
400 | static const struct iio_info adis16136_info = { | 400 | static const struct iio_info adis16136_info = { |
401 | .driver_module = THIS_MODULE, | ||
402 | .attrs = &adis16136_attribute_group, | 401 | .attrs = &adis16136_attribute_group, |
403 | .read_raw = &adis16136_read_raw, | 402 | .read_raw = &adis16136_read_raw, |
404 | .write_raw = &adis16136_write_raw, | 403 | .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 = { | |||
321 | .read_raw = &adis16260_read_raw, | 321 | .read_raw = &adis16260_read_raw, |
322 | .write_raw = &adis16260_write_raw, | 322 | .write_raw = &adis16260_write_raw, |
323 | .update_scan_mode = adis_update_scan_mode, | 323 | .update_scan_mode = adis_update_scan_mode, |
324 | .driver_module = THIS_MODULE, | ||
325 | }; | 324 | }; |
326 | 325 | ||
327 | static const char * const adis1620_status_error_msgs[] = { | 326 | 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] = { | |||
405 | }; | 405 | }; |
406 | 406 | ||
407 | static const struct iio_info adxrs450_info = { | 407 | static const struct iio_info adxrs450_info = { |
408 | .driver_module = THIS_MODULE, | ||
409 | .read_raw = &adxrs450_read_raw, | 408 | .read_raw = &adxrs450_read_raw, |
410 | .write_raw = &adxrs450_write_raw, | 409 | .write_raw = &adxrs450_write_raw, |
411 | }; | 410 | }; |
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 = { | |||
858 | .write_event_value = bmg160_write_event, | 858 | .write_event_value = bmg160_write_event, |
859 | .write_event_config = bmg160_write_event_config, | 859 | .write_event_config = bmg160_write_event_config, |
860 | .read_event_config = bmg160_read_event_config, | 860 | .read_event_config = bmg160_read_event_config, |
861 | .driver_module = THIS_MODULE, | ||
862 | }; | 861 | }; |
863 | 862 | ||
864 | static const unsigned long bmg160_accel_scan_masks[] = { | 863 | static const unsigned long bmg160_accel_scan_masks[] = { |
@@ -956,7 +955,6 @@ static int bmg160_data_rdy_trigger_set_state(struct iio_trigger *trig, | |||
956 | static const struct iio_trigger_ops bmg160_trigger_ops = { | 955 | static const struct iio_trigger_ops bmg160_trigger_ops = { |
957 | .set_trigger_state = bmg160_data_rdy_trigger_set_state, | 956 | .set_trigger_state = bmg160_data_rdy_trigger_set_state, |
958 | .try_reenable = bmg160_trig_try_reen, | 957 | .try_reenable = bmg160_trig_try_reen, |
959 | .owner = THIS_MODULE, | ||
960 | }; | 958 | }; |
961 | 959 | ||
962 | static irqreturn_t bmg160_event_handler(int irq, void *private) | 960 | 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, | |||
186 | } | 186 | } |
187 | 187 | ||
188 | static const struct iio_info gyro_3d_info = { | 188 | static const struct iio_info gyro_3d_info = { |
189 | .driver_module = THIS_MODULE, | ||
190 | .read_raw = &gyro_3d_read_raw, | 189 | .read_raw = &gyro_3d_read_raw, |
191 | .write_raw = &gyro_3d_write_raw, | 190 | .write_raw = &gyro_3d_write_raw, |
192 | }; | 191 | }; |
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 @@ error_ret: | |||
101 | } | 101 | } |
102 | 102 | ||
103 | static const struct iio_trigger_ops itg3200_trigger_ops = { | 103 | static const struct iio_trigger_ops itg3200_trigger_ops = { |
104 | .owner = THIS_MODULE, | ||
105 | .set_trigger_state = &itg3200_data_rdy_trigger_set_state, | 104 | .set_trigger_state = &itg3200_data_rdy_trigger_set_state, |
106 | }; | 105 | }; |
107 | 106 | ||
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[] = { | |||
278 | static const struct iio_info itg3200_info = { | 278 | static const struct iio_info itg3200_info = { |
279 | .read_raw = &itg3200_read_raw, | 279 | .read_raw = &itg3200_read_raw, |
280 | .write_raw = &itg3200_write_raw, | 280 | .write_raw = &itg3200_write_raw, |
281 | .driver_module = THIS_MODULE, | ||
282 | }; | 281 | }; |
283 | 282 | ||
284 | static const unsigned long itg3200_available_scan_masks[] = { 0xffffffff, 0x0 }; | 283 | 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 e0d241a9aa30..77fac81a3adc 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 = { | |||
742 | }; | 742 | }; |
743 | 743 | ||
744 | static const struct iio_info mpu3050_info = { | 744 | static const struct iio_info mpu3050_info = { |
745 | .driver_module = THIS_MODULE, | ||
746 | .read_raw = mpu3050_read_raw, | 745 | .read_raw = mpu3050_read_raw, |
747 | .write_raw = mpu3050_write_raw, | 746 | .write_raw = mpu3050_write_raw, |
748 | .attrs = &mpu3050_attribute_group, | 747 | .attrs = &mpu3050_attribute_group, |
@@ -1032,7 +1031,6 @@ static int mpu3050_drdy_trigger_set_state(struct iio_trigger *trig, | |||
1032 | } | 1031 | } |
1033 | 1032 | ||
1034 | static const struct iio_trigger_ops mpu3050_trigger_ops = { | 1033 | static const struct iio_trigger_ops mpu3050_trigger_ops = { |
1035 | .owner = THIS_MODULE, | ||
1036 | .set_trigger_state = mpu3050_drdy_trigger_set_state, | 1034 | .set_trigger_state = mpu3050_drdy_trigger_set_state, |
1037 | }; | 1035 | }; |
1038 | 1036 | ||
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c index e366422e8512..4cf85aa01dde 100644 --- a/drivers/iio/gyro/st_gyro_core.c +++ b/drivers/iio/gyro/st_gyro_core.c | |||
@@ -326,7 +326,6 @@ static const struct attribute_group st_gyro_attribute_group = { | |||
326 | }; | 326 | }; |
327 | 327 | ||
328 | static const struct iio_info gyro_info = { | 328 | static const struct iio_info gyro_info = { |
329 | .driver_module = THIS_MODULE, | ||
330 | .attrs = &st_gyro_attribute_group, | 329 | .attrs = &st_gyro_attribute_group, |
331 | .read_raw = &st_gyro_read_raw, | 330 | .read_raw = &st_gyro_read_raw, |
332 | .write_raw = &st_gyro_write_raw, | 331 | .write_raw = &st_gyro_write_raw, |
@@ -335,7 +334,6 @@ static const struct iio_info gyro_info = { | |||
335 | 334 | ||
336 | #ifdef CONFIG_IIO_TRIGGER | 335 | #ifdef CONFIG_IIO_TRIGGER |
337 | static const struct iio_trigger_ops st_gyro_trigger_ops = { | 336 | static const struct iio_trigger_ops st_gyro_trigger_ops = { |
338 | .owner = THIS_MODULE, | ||
339 | .set_trigger_state = ST_GYRO_TRIGGER_SET_STATE, | 337 | .set_trigger_state = ST_GYRO_TRIGGER_SET_STATE, |
340 | .validate_device = st_sensors_validate_device, | 338 | .validate_device = st_sensors_validate_device, |
341 | }; | 339 | }; |