Skip to content

Commit

Permalink
staging:iio:resolver:ad2s90 ensure name is passed to iio_core.
Browse files Browse the repository at this point in the history
Scraps the pointless name define and adds an id table.
It's not technically required in drivers with only one supported
part but it does make the probe code more consistent.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Oct 5, 2011
1 parent 72a86cc commit 19147f5
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions drivers/staging/iio/resolver/ad2s90.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
#include "../iio.h"
#include "../sysfs.h"

#define DRV_NAME "ad2s90"

struct ad2s90_state {
struct mutex lock;
struct spi_device *sdev;
Expand Down Expand Up @@ -85,6 +83,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi)
indio_dev->dev.parent = &spi->dev;
indio_dev->info = &ad2s90_info;
indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->name = spi_get_device_id(spi)->name;

ret = iio_device_register(indio_dev);
if (ret)
Expand All @@ -110,13 +109,19 @@ static int __devexit ad2s90_remove(struct spi_device *spi)
return 0;
}

static const struct spi_device_id ad2s90_id[] = {
{ "ad2s90" },
{}
};

static struct spi_driver ad2s90_driver = {
.driver = {
.name = DRV_NAME,
.name = "ad2s90",
.owner = THIS_MODULE,
},
.probe = ad2s90_probe,
.remove = __devexit_p(ad2s90_remove),
.id_table = ad2s90_id,
};

static __init int ad2s90_spi_init(void)
Expand Down

0 comments on commit 19147f5

Please sign in to comment.