Skip to content

Commit

Permalink
staging:iio: Add ability to allocate private data space to iio_alloca…
Browse files Browse the repository at this point in the history 
…te_device

Suggested by Arnd Bergmann.  Note this will break ALL drivers that
are out of mainline.  The fix is trivial change of
iio_allocate_device() -> iio_allocate_device(0)
Sorry if this causes issues for any one!

V2: Include new drivers in the update

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Apr 26, 2011
1 parent b428173 commit 6f7c8ee
Show file tree
Hide file tree
Showing 62 changed files with 89 additions and 63 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/iio/Documentation/device.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The crucial structure for device drivers in iio is iio_dev.

First allocate one using:

struct iio_dev *indio_dev = iio_allocate_device();
struct iio_dev *indio_dev = iio_allocate_device(0);

Then fill in the following:

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16201_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ static int __devinit adis16201_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16203_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ static int __devinit adis16203_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16204_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ static int __devinit adis16204_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16209_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ static int __devinit adis16209_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16220_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ static int __devinit adis16220_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16240_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ static int __devinit adis16240_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/kxsd9.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ static int __devinit kxsd9_probe(struct spi_device *spi)

st->us = spi;
mutex_init(&st->buf_lock);
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/lis3l02dq_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->help.indio_dev = iio_allocate_device();
st->help.indio_dev = iio_allocate_device(0);
if (st->help.indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/sca3000_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1339,7 +1339,7 @@ static int __devinit __sca3000_probe(struct spi_device *spi,
mutex_init(&st->lock);
st->info = &sca3000_spi_chip_info_tbl[variant];

st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_rx;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7150.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ static int __devinit ad7150_probe(struct i2c_client *client,
chip->client = client;
chip->name = id->name;

chip->indio_dev = iio_allocate_device();
chip->indio_dev = iio_allocate_device(0);
if (chip->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_chip;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7152.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ static int __devinit ad7152_probe(struct i2c_client *client,
chip->client = client;
chip->name = id->name;

chip->indio_dev = iio_allocate_device();
chip->indio_dev = iio_allocate_device(0);
if (chip->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_chip;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7291.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ static int __devinit ad7291_probe(struct i2c_client *client,
chip->name = id->name;
chip->command = AD7291_NOISE_DELAY | AD7291_T_SENSE_MASK;

chip->indio_dev = iio_allocate_device();
chip->indio_dev = iio_allocate_device(0);
if (chip->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_chip;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7298_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static int __devinit ad7298_probe(struct spi_device *spi)
atomic_set(&st->protect_ring, 0);
st->spi = spi;

st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7314.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ static int __devinit ad7314_probe(struct spi_device *spi_dev)
chip->spi_dev = spi_dev;
chip->name = spi_dev->modalias;

chip->indio_dev = iio_allocate_device();
chip->indio_dev = iio_allocate_device(0);
if (chip->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_chip;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7476_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static int __devinit ad7476_probe(struct spi_device *spi)
atomic_set(&st->protect_ring, 0);
st->spi = spi;

st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7606_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ struct ad7606_state *ad7606_probe(struct device *dev, int irq,

atomic_set(&st->protect_ring, 0);

st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7745.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ static int __devinit ad774x_probe(struct i2c_client *client,
chip->client = client;
chip->name = id->name;

chip->indio_dev = iio_allocate_device();
chip->indio_dev = iio_allocate_device(0);
if (chip->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_chip;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7780.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ static int __devinit ad7780_probe(struct spi_device *spi)
spi_set_drvdata(spi, st);
st->spi = spi;

st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7816.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ static int __devinit ad7816_probe(struct spi_device *spi_dev)
}
gpio_direction_input(chip->busy_pin);

chip->indio_dev = iio_allocate_device();
chip->indio_dev = iio_allocate_device(0);
if (chip->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_gpio;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7887_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static int __devinit ad7887_probe(struct spi_device *spi)
atomic_set(&st->protect_ring, 0);
st->spi = spi;

st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad799x_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ static int __devinit ad799x_probe(struct i2c_client *client,
}
st->client = client;

st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/adt7310.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ static int __devinit adt7310_probe(struct spi_device *spi_dev)
chip->spi_dev = spi_dev;
chip->name = spi_dev->modalias;

chip->indio_dev = iio_allocate_device();
chip->indio_dev = iio_allocate_device(0);
if (chip->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_chip;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/adt7410.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ static int __devinit adt7410_probe(struct i2c_client *client,
chip->client = client;
chip->name = id->name;

chip->indio_dev = iio_allocate_device();
chip->indio_dev = iio_allocate_device(0);
if (chip->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_chip;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/adt75.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ static int __devinit adt75_probe(struct i2c_client *client,
chip->client = client;
chip->name = id->name;

chip->indio_dev = iio_allocate_device();
chip->indio_dev = iio_allocate_device(0);
if (chip->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_chip;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/max1363_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1695,7 +1695,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
}
st->client = client;

st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/addac/adt7316.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2299,7 +2299,7 @@ int __devinit adt7316_probe(struct device *dev, struct adt7316_bus *bus,
if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
chip->int_mask |= ADT7516_AIN_INT_MASK;

chip->indio_dev = iio_allocate_device();
chip->indio_dev = iio_allocate_device(0);
if (chip->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_chip;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dac/ad5446.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ static int __devinit ad5446_probe(struct spi_device *spi)

st->spi = spi;

st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dac/ad5504.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ static int __devinit ad5504_probe(struct spi_device *spi)
dev_warn(&spi->dev, "reference voltage unspecified\n");

st->spi = spi;
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dac/ad5624r_spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ static int __devinit ad5624r_probe(struct spi_device *spi)
st->vref_mv = st->chip_info->int_vref_mv;

st->us = spi;
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dac/ad5791.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ static int __devinit ad5791_probe(struct spi_device *spi)
st->pwr_down = true;

st->spi = spi;
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg_neg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dac/max517.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ static int max517_probe(struct i2c_client *client,

data->client = client;

data->indio_dev = iio_allocate_device();
data->indio_dev = iio_allocate_device(0);
if (data->indio_dev == NULL) {
err = -ENOMEM;
goto exit_free_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dds/ad5930.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static int __devinit ad5930_probe(struct spi_device *spi)
mutex_init(&st->lock);
st->sdev = spi;

st->idev = iio_allocate_device();
st->idev = iio_allocate_device(0);
if (st->idev == NULL) {
ret = -ENOMEM;
goto error_free_st;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dds/ad9832.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ static int __devinit ad9832_probe(struct spi_device *spi)
spi_set_drvdata(spi, st);
st->spi = spi;

st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dds/ad9834.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static int __devinit ad9834_probe(struct spi_device *spi)
st->spi = spi;
st->devid = spi_get_device_id(spi)->driver_data;

st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dds/ad9850.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static int __devinit ad9850_probe(struct spi_device *spi)
mutex_init(&st->lock);
st->sdev = spi;

st->idev = iio_allocate_device();
st->idev = iio_allocate_device(0);
if (st->idev == NULL) {
ret = -ENOMEM;
goto error_free_st;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dds/ad9852.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ static int __devinit ad9852_probe(struct spi_device *spi)
mutex_init(&st->lock);
st->sdev = spi;

st->idev = iio_allocate_device();
st->idev = iio_allocate_device(0);
if (st->idev == NULL) {
ret = -ENOMEM;
goto error_free_st;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dds/ad9910.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ static int __devinit ad9910_probe(struct spi_device *spi)
mutex_init(&st->lock);
st->sdev = spi;

st->idev = iio_allocate_device();
st->idev = iio_allocate_device(0);
if (st->idev == NULL) {
ret = -ENOMEM;
goto error_free_st;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/dds/ad9951.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ static int __devinit ad9951_probe(struct spi_device *spi)
mutex_init(&st->lock);
st->sdev = spi;

st->idev = iio_allocate_device();
st->idev = iio_allocate_device(0);
if (st->idev == NULL) {
ret = -ENOMEM;
goto error_free_st;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/gyro/adis16060_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ static int __devinit adis16060_r_probe(struct spi_device *spi)
st->us_r = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_st;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/gyro/adis16080_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static int __devinit adis16080_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_st;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/gyro/adis16130_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ static int __devinit adis16130_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_st;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/gyro/adis16260_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ static int __devinit adis16260_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/gyro/adxrs450_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ static int __devinit adxrs450_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device();
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
Expand Down
Loading

0 comments on commit 6f7c8ee

Please sign in to comment.