Commit 9cd15d52 authored by Denis Ciocca's avatar Denis Ciocca Committed by Jonathan Cameron
Browse files

iio: remove get_irq_data_ready() function pointer and use IRQ number directly 



Not even sure why it was there since the beginning. Just use IRQ
number in the sensor_data struct.

Signed-off-by: default avatarDenis Ciocca <denis.ciocca@st.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 48cceecf

drivers/iio/accel/st_accel_core.c

+3 −4
Original line number Diff line number Diff line
@@ -1169,7 +1169,6 @@ int st_accel_common_probe(struct iio_dev *indio_dev) 
	struct st_sensor_data *adata = iio_priv(indio_dev);

	struct st_sensors_platform_data *pdata =

		(struct st_sensors_platform_data *)adata->dev->platform_data;

	int irq = adata->get_irq_data_ready(indio_dev);

	struct iio_chan_spec *channels;

	size_t channels_size;

	int err;
@@ -1217,7 +1216,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev) 
	if (err < 0)

		goto st_accel_power_off;



	if (irq > 0) {

	if (adata->irq > 0) {

		err = st_sensors_allocate_trigger(indio_dev,

						 ST_ACCEL_TRIGGER_OPS);

		if (err < 0)
@@ -1234,7 +1233,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev) 
	return 0;



st_accel_device_register_error:

	if (irq > 0)

	if (adata->irq > 0)

		st_sensors_deallocate_trigger(indio_dev);

st_accel_probe_trigger_error:

	st_accel_deallocate_ring(indio_dev);
@@ -1252,7 +1251,7 @@ void st_accel_common_remove(struct iio_dev *indio_dev) 
	st_sensors_power_disable(indio_dev);



	iio_device_unregister(indio_dev);

	if (adata->get_irq_data_ready(indio_dev) > 0)

	if (adata->irq > 0)

		st_sensors_deallocate_trigger(indio_dev);



	st_accel_deallocate_ring(indio_dev);

drivers/iio/common/st_sensors/st_sensors_i2c.c

+1 −8
Original line number Diff line number Diff line
@@ -20,13 +20,6 @@ 


#define ST_SENSORS_I2C_MULTIREAD	0x80



static unsigned int st_sensors_i2c_get_irq(struct iio_dev *indio_dev)

{

	struct st_sensor_data *sdata = iio_priv(indio_dev);



	return to_i2c_client(sdata->dev)->irq;

}



static const struct regmap_config st_sensors_i2c_regmap_config = {

	.reg_bits = 8,

	.val_bits = 8,
@@ -69,7 +62,7 @@ int st_sensors_i2c_configure(struct iio_dev *indio_dev, 
	indio_dev->name = client->name;



	sdata->dev = &client->dev;

	sdata->get_irq_data_ready = st_sensors_i2c_get_irq;

	sdata->irq = client->irq;



	return 0;

}

drivers/iio/common/st_sensors/st_sensors_spi.c

+1 −8
Original line number Diff line number Diff line
@@ -18,13 +18,6 @@ 


#define ST_SENSORS_SPI_MULTIREAD	0xc0



static unsigned int st_sensors_spi_get_irq(struct iio_dev *indio_dev)

{

	struct st_sensor_data *sdata = iio_priv(indio_dev);



	return to_spi_device(sdata->dev)->irq;

}



static const struct regmap_config st_sensors_spi_regmap_config = {

	.reg_bits = 8,

	.val_bits = 8,
@@ -117,7 +110,7 @@ int st_sensors_spi_configure(struct iio_dev *indio_dev, 
	indio_dev->name = spi->modalias;



	sdata->dev = &spi->dev;

	sdata->get_irq_data_ready = st_sensors_spi_get_irq;

	sdata->irq = spi->irq;



	return 0;

}

drivers/iio/common/st_sensors/st_sensors_trigger.c

+10 −11
Original line number Diff line number Diff line
@@ -121,9 +121,9 @@ static irqreturn_t st_sensors_irq_thread(int irq, void *p) 
int st_sensors_allocate_trigger(struct iio_dev *indio_dev,

				const struct iio_trigger_ops *trigger_ops)

{

	int err, irq;

	struct st_sensor_data *sdata = iio_priv(indio_dev);

	unsigned long irq_trig;

	int err;



	sdata->trig = iio_trigger_alloc("%s-trigger", indio_dev->name);

	if (sdata->trig == NULL) {
@@ -135,8 +135,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, 
	sdata->trig->ops = trigger_ops;

	sdata->trig->dev.parent = sdata->dev;



	irq = sdata->get_irq_data_ready(indio_dev);

	irq_trig = irqd_get_trigger_type(irq_get_irq_data(irq));

	irq_trig = irqd_get_trigger_type(irq_get_irq_data(sdata->irq));

	/*

	 * If the IRQ is triggered on falling edge, we need to mark the

	 * interrupt as active low, if the hardware supports this.
@@ -206,7 +205,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, 
	    sdata->sensor_settings->drdy_irq.stat_drdy.addr)

		irq_trig |= IRQF_SHARED;



	err = request_threaded_irq(sdata->get_irq_data_ready(indio_dev),

	err = request_threaded_irq(sdata->irq,

				   st_sensors_irq_handler,

				   st_sensors_irq_thread,

				   irq_trig,
@@ -227,7 +226,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, 
	return 0;



iio_trigger_register_error:

	free_irq(sdata->get_irq_data_ready(indio_dev), sdata->trig);

	free_irq(sdata->irq, sdata->trig);

iio_trigger_free:

	iio_trigger_free(sdata->trig);

	return err;
@@ -239,7 +238,7 @@ void st_sensors_deallocate_trigger(struct iio_dev *indio_dev) 
	struct st_sensor_data *sdata = iio_priv(indio_dev);



	iio_trigger_unregister(sdata->trig);

	free_irq(sdata->get_irq_data_ready(indio_dev), sdata->trig);

	free_irq(sdata->irq, sdata->trig);

	iio_trigger_free(sdata->trig);

}

EXPORT_SYMBOL(st_sensors_deallocate_trigger);

drivers/iio/gyro/st_gyro_core.c

+3 −4
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ EXPORT_SYMBOL(st_gyro_get_settings); 
int st_gyro_common_probe(struct iio_dev *indio_dev)

{

	struct st_sensor_data *gdata = iio_priv(indio_dev);

	int irq = gdata->get_irq_data_ready(indio_dev);

	int err;



	indio_dev->modes = INDIO_DIRECT_MODE;
@@ -419,7 +418,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev) 
	if (err < 0)

		goto st_gyro_power_off;



	if (irq > 0) {

	if (gdata->irq > 0) {

		err = st_sensors_allocate_trigger(indio_dev,

						  ST_GYRO_TRIGGER_OPS);

		if (err < 0)
@@ -436,7 +435,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev) 
	return 0;



st_gyro_device_register_error:

	if (irq > 0)

	if (gdata->irq > 0)

		st_sensors_deallocate_trigger(indio_dev);

st_gyro_probe_trigger_error:

	st_gyro_deallocate_ring(indio_dev);
@@ -454,7 +453,7 @@ void st_gyro_common_remove(struct iio_dev *indio_dev) 
	st_sensors_power_disable(indio_dev);



	iio_device_unregister(indio_dev);

	if (gdata->get_irq_data_ready(indio_dev) > 0)

	if (gdata->irq > 0)

		st_sensors_deallocate_trigger(indio_dev);



	st_gyro_deallocate_ring(indio_dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE