Commit eca8523a authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

iio:trigger: rename try_reenable() to reenable() plus return void 



As we no longer support a try again if we cannot reenable the trigger
rename the function to reflect this.   Also we don't do anything with
the value returned so stop it returning anything.  For the few drivers
that didn't already print an error message in this patch, add such
a print.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Christian Oder <me@myself5.de>
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Cc: Nishant Malpani <nish.malpani25@gmail.com>
Cc: Daniel Baluta <daniel.baluta@oss.nxp.com>
Link: https://lore.kernel.org/r/20200920132548.196452-3-jic23@kernel.org
parent 01d37c83

drivers/iio/accel/bma180.c

+6 −3
Original line number Diff line number Diff line
@@ -959,17 +959,20 @@ static int bma180_data_rdy_trigger_set_state(struct iio_trigger *trig, 
	return bma180_set_new_data_intr_state(data, state);

}



static int bma180_trig_try_reen(struct iio_trigger *trig)

static void bma180_trig_reen(struct iio_trigger *trig)

{

	struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);

	struct bma180_data *data = iio_priv(indio_dev);

	int ret;



	return bma180_reset_intr(data);

	ret = bma180_reset_intr(data);

	if (ret)

		dev_err(&data->client->dev, "failed to reset interrupt\n");

}



static const struct iio_trigger_ops bma180_trigger_ops = {

	.set_trigger_state = bma180_data_rdy_trigger_set_state,

	.try_reenable = bma180_trig_try_reen,

	.reenable = bma180_trig_reen,

};



static int bma180_probe(struct i2c_client *client,

drivers/iio/accel/bmc150-accel-core.c

+4 −8
Original line number Diff line number Diff line
@@ -1151,7 +1151,7 @@ static irqreturn_t bmc150_accel_trigger_handler(int irq, void *p) 
	return IRQ_HANDLED;

}



static int bmc150_accel_trig_try_reen(struct iio_trigger *trig)

static void bmc150_accel_trig_reen(struct iio_trigger *trig)

{

	struct bmc150_accel_trigger *t = iio_trigger_get_drvdata(trig);

	struct bmc150_accel_data *data = t->data;
@@ -1160,7 +1160,7 @@ static int bmc150_accel_trig_try_reen(struct iio_trigger *trig) 


	/* new data interrupts don't need ack */

	if (t == &t->data->triggers[BMC150_ACCEL_TRIGGER_DATA_READY])

		return 0;

		return;



	mutex_lock(&data->mutex);

	/* clear any latched interrupt */
@@ -1168,12 +1168,8 @@ static int bmc150_accel_trig_try_reen(struct iio_trigger *trig) 
			   BMC150_ACCEL_INT_MODE_LATCH_INT |

			   BMC150_ACCEL_INT_MODE_LATCH_RESET);

	mutex_unlock(&data->mutex);

	if (ret < 0) {

	if (ret < 0)

		dev_err(dev, "Error writing reg_int_rst_latch\n");

		return ret;

	}



	return 0;

}



static int bmc150_accel_trigger_set_state(struct iio_trigger *trig,
@@ -1213,7 +1209,7 @@ 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,

	.reenable = bmc150_accel_trig_reen,

};



static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)

drivers/iio/accel/kxcjk-1013.c

+3 −7
Original line number Diff line number Diff line
@@ -1105,19 +1105,15 @@ static irqreturn_t kxcjk1013_trigger_handler(int irq, void *p) 
	return IRQ_HANDLED;

}



static int kxcjk1013_trig_try_reen(struct iio_trigger *trig)

static void kxcjk1013_trig_reen(struct iio_trigger *trig)

{

	struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);

	struct kxcjk1013_data *data = iio_priv(indio_dev);

	int ret;



	ret = i2c_smbus_read_byte_data(data->client, KXCJK1013_REG_INT_REL);

	if (ret < 0) {

	if (ret < 0)

		dev_err(&data->client->dev, "Error reading reg_int_rel\n");

		return ret;

	}



	return 0;

}



static int kxcjk1013_data_rdy_trigger_set_state(struct iio_trigger *trig,
@@ -1161,7 +1157,7 @@ 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,

	.reenable = kxcjk1013_trig_reen,

};



static void kxcjk1013_report_motion_event(struct iio_dev *indio_dev)

drivers/iio/accel/mxc4005.c

+6 −10
Original line number Diff line number Diff line
@@ -310,19 +310,15 @@ static irqreturn_t mxc4005_trigger_handler(int irq, void *private) 
	return IRQ_HANDLED;

}



static int mxc4005_clr_intr(struct mxc4005_data *data)

static void mxc4005_clr_intr(struct mxc4005_data *data)

{

	int ret;



	/* clear interrupt */

	ret = regmap_write(data->regmap, MXC4005_REG_INT_CLR1,

			   MXC4005_REG_INT_CLR1_BIT_DRDYC);

	if (ret < 0) {

	if (ret < 0)

		dev_err(data->dev, "failed to write to reg_int_clr1\n");

		return ret;

	}



	return 0;

}



static int mxc4005_set_trigger_state(struct iio_trigger *trig,
@@ -353,20 +349,20 @@ static int mxc4005_set_trigger_state(struct iio_trigger *trig, 
	return 0;

}



static int mxc4005_trigger_try_reen(struct iio_trigger *trig)

static void mxc4005_trigger_reen(struct iio_trigger *trig)

{

	struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);

	struct mxc4005_data *data = iio_priv(indio_dev);



	if (!data->dready_trig)

		return 0;

		return;



	return mxc4005_clr_intr(data);

	mxc4005_clr_intr(data);

}



static const struct iio_trigger_ops mxc4005_trigger_ops = {

	.set_trigger_state = mxc4005_set_trigger_state,

	.try_reenable = mxc4005_trigger_try_reen,

	.reenable = mxc4005_trigger_reen,

};



static int mxc4005_chip_init(struct mxc4005_data *data)

drivers/iio/adc/at91-sama5d2_adc.c

+3 −5
Original line number Diff line number Diff line
@@ -742,26 +742,24 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) 
	return 0;

}



static int at91_adc_reenable_trigger(struct iio_trigger *trig)

static void at91_adc_reenable_trigger(struct iio_trigger *trig)

{

	struct iio_dev *indio = iio_trigger_get_drvdata(trig);

	struct at91_adc_state *st = iio_priv(indio);



	/* if we are using DMA, we must not reenable irq after each trigger */

	if (st->dma_st.dma_chan)

		return 0;

		return;



	enable_irq(st->irq);



	/* Needed to ACK the DRDY interruption */

	at91_adc_readl(st, AT91_SAMA5D2_LCDR);



	return 0;

}



static const struct iio_trigger_ops at91_adc_trigger_ops = {

	.set_trigger_state = &at91_adc_configure_trigger,

	.try_reenable = &at91_adc_reenable_trigger,

	.reenable = &at91_adc_reenable_trigger,

	.validate_device = iio_trigger_validate_own_device,

};