Commit 995071d3 authored by Gwendal Grignou's avatar Gwendal Grignou Committed by Jonathan Cameron
Browse files

iio: set default trig->dev.parent 



When allocated with [devm_]iio_trigger_alloc(), set trig device parent to
the device the trigger is allocated for by default.

It can always be reassigned in the probe routine.

Change iio_trigger_alloc() API to add the device pointer to be coherent
with devm_iio_trigger_alloc, using similar interface to
iio_device_alloc().

Signed-off-by: default avatarGwendal Grignou <gwendal@chromium.org>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20210309193620.2176163-2-gwendal@chromium.org


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 7b8d045e

drivers/iio/accel/bma180.c

+1 −2
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ static int bma180_probe(struct i2c_client *client, 
	indio_dev->info = &bma180_info;



	if (client->irq > 0) {

		data->trig = iio_trigger_alloc("%s-dev%d", indio_dev->name,

		data->trig = iio_trigger_alloc(dev, "%s-dev%d", indio_dev->name,

			indio_dev->id);

		if (!data->trig) {

			ret = -ENOMEM;
@@ -1059,7 +1059,6 @@ static int bma180_probe(struct i2c_client *client, 
			goto err_trigger_free;

		}



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

		data->trig->ops = &bma180_trigger_ops;

		iio_trigger_set_drvdata(data->trig, indio_dev);

		indio_dev->trig = iio_trigger_get(data->trig);

drivers/iio/adc/ad_sigma_delta.c

+3 −3
Original line number Diff line number Diff line
@@ -475,7 +475,8 @@ static int ad_sd_probe_trigger(struct iio_dev *indio_dev) 
	struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev);

	int ret;



	sigma_delta->trig = iio_trigger_alloc("%s-dev%d", indio_dev->name,

	sigma_delta->trig = iio_trigger_alloc(&sigma_delta->spi->dev,

					      "%s-dev%d", indio_dev->name,

					      indio_dev->id);

	if (sigma_delta->trig == NULL) {

		ret = -ENOMEM;
@@ -496,7 +497,6 @@ static int ad_sd_probe_trigger(struct iio_dev *indio_dev) 
		sigma_delta->irq_dis = true;

		disable_irq_nosync(sigma_delta->spi->irq);

	}

	sigma_delta->trig->dev.parent = &sigma_delta->spi->dev;

	iio_trigger_set_drvdata(sigma_delta->trig, sigma_delta);



	ret = iio_trigger_register(sigma_delta->trig);

drivers/iio/adc/at91_adc.c

+1 −2
Original line number Diff line number Diff line
@@ -625,12 +625,11 @@ static struct iio_trigger *at91_adc_allocate_trigger(struct iio_dev *idev, 
	struct iio_trigger *trig;

	int ret;



	trig = iio_trigger_alloc("%s-dev%d-%s", idev->name,

	trig = iio_trigger_alloc(idev->dev.parent, "%s-dev%d-%s", idev->name,

				 idev->id, trigger->name);

	if (trig == NULL)

		return NULL;



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

	iio_trigger_set_drvdata(trig, idev);

	trig->ops = &at91_adc_trigger_ops;

drivers/iio/common/hid-sensors/hid-sensor-trigger.c

+2 −2
Original line number Diff line number Diff line
@@ -255,14 +255,14 @@ int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name, 
		return ret;

	}



	trig = iio_trigger_alloc("%s-dev%d", name, indio_dev->id);

	trig = iio_trigger_alloc(indio_dev->dev.parent,

				 "%s-dev%d", name, indio_dev->id);

	if (trig == NULL) {

		dev_err(&indio_dev->dev, "Trigger Allocate Failed\n");

		ret = -ENOMEM;

		goto error_triggered_buffer_cleanup;

	}



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

	iio_trigger_set_drvdata(trig, attrb);

	trig->ops = &hid_sensor_trigger_ops;

	ret = iio_trigger_register(trig);

drivers/iio/common/st_sensors/st_sensors_trigger.c

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, 
	unsigned long irq_trig;

	int err;



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

	sdata->trig = iio_trigger_alloc(sdata->dev, "%s-trigger",

					indio_dev->name);

	if (sdata->trig == NULL) {

		dev_err(&indio_dev->dev, "failed to allocate iio trigger.\n");

		return -ENOMEM;
@@ -131,7 +132,6 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, 


	iio_trigger_set_drvdata(sdata->trig, indio_dev);

	sdata->trig->ops = trigger_ops;

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



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

	/*