aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/light/isl29018.c
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-05-18 09:42:37 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-19 19:15:05 -0400
commit6fe8135fccd66aedcc55ded70824342587fd2499 (patch)
tree3afc7acfd0edc052ba93241761e935af9a3b6ebc /drivers/staging/iio/light/isl29018.c
parenta3f02370c9fa6d85fbee2c11649ebc9c84bae919 (diff)
staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
This was suggested by Arnd Bergmann, Other elements may well move in here in future, but it definitely makes sense for these. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/light/isl29018.c')
-rw-r--r--drivers/staging/iio/light/isl29018.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index 307c66426dc..4794ffd5e44 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -455,6 +455,11 @@ static int isl29018_chip_init(struct i2c_client *client)
455 return 0; 455 return 0;
456} 456}
457 457
458static const struct iio_info isl29108_info = {
459 .attrs = &isl29108_group,
460 .driver_module = THIS_MODULE,
461};
462
458static int __devinit isl29018_probe(struct i2c_client *client, 463static int __devinit isl29018_probe(struct i2c_client *client,
459 const struct i2c_device_id *id) 464 const struct i2c_device_id *id)
460{ 465{
@@ -485,11 +490,10 @@ static int __devinit isl29018_probe(struct i2c_client *client,
485 dev_err(&client->dev, "iio allocation fails\n"); 490 dev_err(&client->dev, "iio allocation fails\n");
486 goto exit_free; 491 goto exit_free;
487 } 492 }
488 chip->indio_dev->attrs = &isl29108_group; 493 chip->indio_dev->info = &isl29108_info;
489 chip->indio_dev->name = id->name; 494 chip->indio_dev->name = id->name;
490 chip->indio_dev->dev.parent = &client->dev; 495 chip->indio_dev->dev.parent = &client->dev;
491 chip->indio_dev->dev_data = (void *)(chip); 496 chip->indio_dev->dev_data = (void *)(chip);
492 chip->indio_dev->driver_module = THIS_MODULE;
493 chip->indio_dev->modes = INDIO_DIRECT_MODE; 497 chip->indio_dev->modes = INDIO_DIRECT_MODE;
494 err = iio_device_register(chip->indio_dev); 498 err = iio_device_register(chip->indio_dev);
495 if (err) { 499 if (err) {