Commit 15ea2878 authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

iio: core: move @id from struct iio_dev to struct iio_dev_opaque 



Continuing from Alexandru Ardelean's introduction of the split between
driver modifiable fields and those that should only be set by the core.

This could have been done in two steps to make the actual move after
introducing iio_device_id() but there seemed limited point to that
given how mechanical the majority of the patch is.

Includes fixup from Alex for missing mxs-lradc-adc conversion.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarAlexandru Ardelean <ardeleanalex@gmail.com>
Link: https://lore.kernel.org/r/20210426174911.397061-2-jic23@kernel.org
parent e6cc8f2b

drivers/iio/accel/adxl372.c

+2 −2
Original line number Diff line number Diff line
@@ -1223,14 +1223,14 @@ int adxl372_probe(struct device *dev, struct regmap *regmap, 
		st->dready_trig = devm_iio_trigger_alloc(dev,

							 "%s-dev%d",

							 indio_dev->name,

							 indio_dev->id);

							 iio_device_id(indio_dev));

		if (st->dready_trig == NULL)

			return -ENOMEM;



		st->peak_datardy_trig = devm_iio_trigger_alloc(dev,

							       "%s-dev%d-peak",

							       indio_dev->name,

							       indio_dev->id);

							       iio_device_id(indio_dev));

		if (!st->peak_datardy_trig)

			return -ENOMEM;

drivers/iio/accel/bma180.c

+1 −1
Original line number Diff line number Diff line
@@ -1045,7 +1045,7 @@ static int bma180_probe(struct i2c_client *client, 


	if (client->irq > 0) {

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

			indio_dev->id);

					       iio_device_id(indio_dev));

		if (!data->trig) {

			ret = -ENOMEM;

			goto err_chip_disable;

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

+2 −2
Original line number Diff line number Diff line
@@ -1472,7 +1472,7 @@ static int bmc150_accel_triggers_setup(struct iio_dev *indio_dev, 
		t->indio_trig = devm_iio_trigger_alloc(dev,

						       bmc150_accel_triggers[i].name,

						       indio_dev->name,

						       indio_dev->id);

						       iio_device_id(indio_dev));

		if (!t->indio_trig) {

			ret = -ENOMEM;

			break;

drivers/iio/accel/kxcjk-1013.c

+2 −2
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ static int kxcjk1013_probe(struct i2c_client *client, 
		data->dready_trig = devm_iio_trigger_alloc(&client->dev,

							   "%s-dev%d",

							   indio_dev->name,

							   indio_dev->id);

							   iio_device_id(indio_dev));

		if (!data->dready_trig) {

			ret = -ENOMEM;

			goto err_poweroff;
@@ -1413,7 +1413,7 @@ static int kxcjk1013_probe(struct i2c_client *client, 
		data->motion_trig = devm_iio_trigger_alloc(&client->dev,

							  "%s-any-motion-dev%d",

							  indio_dev->name,

							  indio_dev->id);

							  iio_device_id(indio_dev));

		if (!data->motion_trig) {

			ret = -ENOMEM;

			goto err_poweroff;

drivers/iio/accel/mma8452.c

+1 −1
Original line number Diff line number Diff line
@@ -1461,7 +1461,7 @@ static int mma8452_trigger_setup(struct iio_dev *indio_dev) 


	trig = devm_iio_trigger_alloc(&data->client->dev, "%s-dev%d",

				      indio_dev->name,

				      indio_dev->id);

				      iio_device_id(indio_dev));

	if (!trig)

		return -ENOMEM;