diff options
| author | Jonathan Cameron | 2011-04-15 19:55:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-04-26 02:23:09 +0200 |
| commit | 6f7c8ee585e9db54cb29af1bdb93f29837824933 (patch) | |
| tree | 2eaf2ef782137ed1b9996c0fd511c40f1efb6625 /drivers/staging/iio/light | |
| parent | staging:iio: replace rip_lots naming with read_first_n (diff) | |
| download | kernel-qcow2-linux-6f7c8ee585e9db54cb29af1bdb93f29837824933.tar.gz kernel-qcow2-linux-6f7c8ee585e9db54cb29af1bdb93f29837824933.tar.xz kernel-qcow2-linux-6f7c8ee585e9db54cb29af1bdb93f29837824933.zip | |
staging:iio: Add ability to allocate private data space to iio_allocate_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>
Diffstat (limited to 'drivers/staging/iio/light')
| -rw-r--r-- | drivers/staging/iio/light/isl29018.c | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/light/tsl2563.c | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/light/tsl2583.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c index f919cc1d35e1..dfbc423a75e4 100644 --- a/drivers/staging/iio/light/isl29018.c +++ b/drivers/staging/iio/light/isl29018.c @@ -492,7 +492,7 @@ static int __devinit isl29018_probe(struct i2c_client *client, if (err) goto exit_free; - chip->indio_dev = iio_allocate_device(); + chip->indio_dev = iio_allocate_device(0); if (!chip->indio_dev) { dev_err(&client->dev, "iio allocation fails\n"); goto exit_free; diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c index dadae7527d5c..35d94c6d8d8f 100644 --- a/drivers/staging/iio/light/tsl2563.c +++ b/drivers/staging/iio/light/tsl2563.c @@ -857,7 +857,7 @@ static int __devinit tsl2563_probe(struct i2c_client *client, dev_info(&client->dev, "model %d, rev. %d\n", id >> 4, id & 0x0f); - chip->indio_dev = iio_allocate_device(); + chip->indio_dev = iio_allocate_device(0); if (!chip->indio_dev) goto fail1; chip->indio_dev->attrs = &tsl2563_group; diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c index 1740843ee12a..b87ccd5a2f50 100644 --- a/drivers/staging/iio/light/tsl2583.c +++ b/drivers/staging/iio/light/tsl2583.c @@ -847,7 +847,7 @@ static int __devinit taos_probe(struct i2c_client *clientp, goto fail1; } - chip->iio_dev = iio_allocate_device(); + chip->iio_dev = iio_allocate_device(0); if (!chip->iio_dev) { ret = -ENOMEM; dev_err(&clientp->dev, "iio allocation failed\n"); |