diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-09-29 15:03:01 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:30 -0800 |
| commit | 27e347bab53f4da6d601627475a3944a0c467064 (patch) | |
| tree | dc549b8584fec606b04550e5b24222a67856b35e /drivers/staging | |
| parent | b6c3e02bb333ad534de0250231d173344897d899 (diff) | |
3.0: update isl29028 with iio changes
Rebase-Id: R5de165b205927a47ac2d3e1c8cfa916105682e0d
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/iio/light/isl29028.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c index ea7c284b219b..0b1d2f2f73aa 100644 --- a/drivers/staging/iio/light/isl29028.c +++ b/drivers/staging/iio/light/isl29028.c @@ -1152,6 +1152,11 @@ static irqreturn_t threshold_isr(int irq, void *irq_data) return IRQ_HANDLED; } +static const struct iio_info isl29028_info = { + .attrs = &isl29108_group, + .driver_module = THIS_MODULE, +}; + static int __devinit isl29028_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -1191,16 +1196,15 @@ static int __devinit isl29028_probe(struct i2c_client *client, } chip->is_int_enable = true; - 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_irq; } - chip->indio_dev->attrs = &isl29108_group; + chip->indio_dev->info = &isl29028_info; chip->indio_dev->dev.parent = &client->dev; chip->indio_dev->dev_data = (void *)(chip); - chip->indio_dev->driver_module = THIS_MODULE; chip->indio_dev->modes = INDIO_DIRECT_MODE; err = iio_device_register(chip->indio_dev); if (err) { |