Commit 19147f5b authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio:resolver:ad2s90 ensure name is passed to iio_core.

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: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 72a86ccd
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
#include "../iio.h" #include "../iio.h"
#include "../sysfs.h" #include "../sysfs.h"
#define DRV_NAME "ad2s90"
struct ad2s90_state { struct ad2s90_state {
struct mutex lock; struct mutex lock;
struct spi_device *sdev; struct spi_device *sdev;
...@@ -85,6 +83,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi) ...@@ -85,6 +83,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi)
indio_dev->dev.parent = &spi->dev; indio_dev->dev.parent = &spi->dev;
indio_dev->info = &ad2s90_info; indio_dev->info = &ad2s90_info;
indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->name = spi_get_device_id(spi)->name;
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
if (ret) if (ret)
...@@ -110,13 +109,19 @@ static int __devexit ad2s90_remove(struct spi_device *spi) ...@@ -110,13 +109,19 @@ static int __devexit ad2s90_remove(struct spi_device *spi)
return 0; return 0;
} }
static const struct spi_device_id ad2s90_id[] = {
{ "ad2s90" },
{}
};
static struct spi_driver ad2s90_driver = { static struct spi_driver ad2s90_driver = {
.driver = { .driver = {
.name = DRV_NAME, .name = "ad2s90",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ad2s90_probe, .probe = ad2s90_probe,
.remove = __devexit_p(ad2s90_remove), .remove = __devexit_p(ad2s90_remove),
.id_table = ad2s90_id,
}; };
static __init int ad2s90_spi_init(void) static __init int ad2s90_spi_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment