diff options
author | 2016-04-11 10:41:07 +0300 | |
---|---|---|
committer | 2016-04-13 08:17:18 +0300 | |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/iio/resolver | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/iio/resolver')
-rw-r--r-- | kernel/drivers/staging/iio/resolver/Kconfig | 4 | ||||
-rw-r--r-- | kernel/drivers/staging/iio/resolver/ad2s1200.c | 1 | ||||
-rw-r--r-- | kernel/drivers/staging/iio/resolver/ad2s1210.c | 3 | ||||
-rw-r--r-- | kernel/drivers/staging/iio/resolver/ad2s90.c | 11 |
4 files changed, 4 insertions, 15 deletions
diff --git a/kernel/drivers/staging/iio/resolver/Kconfig b/kernel/drivers/staging/iio/resolver/Kconfig index c7a742ec1..1c7e2860d 100644 --- a/kernel/drivers/staging/iio/resolver/Kconfig +++ b/kernel/drivers/staging/iio/resolver/Kconfig @@ -16,7 +16,7 @@ config AD2S90 config AD2S1200 tristate "Analog Devices ad2s1200/ad2s1205 driver" depends on SPI - depends on GPIOLIB + depends on GPIOLIB || COMPILE_TEST help Say yes here to build support for Analog Devices spi resolver to digital converters, ad2s1200 and ad2s1205, provides direct access @@ -28,7 +28,7 @@ config AD2S1200 config AD2S1210 tristate "Analog Devices ad2s1210 driver" depends on SPI - depends on GPIOLIB + depends on GPIOLIB || COMPILE_TEST help Say yes here to build support for Analog Devices spi resolver to digital converters, ad2s1210, provides direct access via sysfs. diff --git a/kernel/drivers/staging/iio/resolver/ad2s1200.c b/kernel/drivers/staging/iio/resolver/ad2s1200.c index c17893b49..595e711d3 100644 --- a/kernel/drivers/staging/iio/resolver/ad2s1200.c +++ b/kernel/drivers/staging/iio/resolver/ad2s1200.c @@ -155,7 +155,6 @@ MODULE_DEVICE_TABLE(spi, ad2s1200_id); static struct spi_driver ad2s1200_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, }, .probe = ad2s1200_probe, .id_table = ad2s1200_id, diff --git a/kernel/drivers/staging/iio/resolver/ad2s1210.c b/kernel/drivers/staging/iio/resolver/ad2s1210.c index 7bc3e4a73..d97aa2827 100644 --- a/kernel/drivers/staging/iio/resolver/ad2s1210.c +++ b/kernel/drivers/staging/iio/resolver/ad2s1210.c @@ -633,7 +633,7 @@ error_ret: } static const struct iio_info ad2s1210_info = { - .read_raw = &ad2s1210_read_raw, + .read_raw = ad2s1210_read_raw, .attrs = &ad2s1210_attribute_group, .driver_module = THIS_MODULE, }; @@ -735,7 +735,6 @@ MODULE_DEVICE_TABLE(spi, ad2s1210_id); static struct spi_driver ad2s1210_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, }, .probe = ad2s1210_probe, .remove = ad2s1210_remove, diff --git a/kernel/drivers/staging/iio/resolver/ad2s90.c b/kernel/drivers/staging/iio/resolver/ad2s90.c index e24c58906..5b1c0db33 100644 --- a/kernel/drivers/staging/iio/resolver/ad2s90.c +++ b/kernel/drivers/staging/iio/resolver/ad2s90.c @@ -79,7 +79,7 @@ static int ad2s90_probe(struct spi_device *spi) indio_dev->num_channels = 1; indio_dev->name = spi_get_device_id(spi)->name; - ret = iio_device_register(indio_dev); + ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev); if (ret) return ret; @@ -91,13 +91,6 @@ static int ad2s90_probe(struct spi_device *spi) return 0; } -static int ad2s90_remove(struct spi_device *spi) -{ - iio_device_unregister(spi_get_drvdata(spi)); - - return 0; -} - static const struct spi_device_id ad2s90_id[] = { { "ad2s90" }, {} @@ -107,10 +100,8 @@ MODULE_DEVICE_TABLE(spi, ad2s90_id); static struct spi_driver ad2s90_driver = { .driver = { .name = "ad2s90", - .owner = THIS_MODULE, }, .probe = ad2s90_probe, - .remove = ad2s90_remove, .id_table = ad2s90_id, }; module_spi_driver(ad2s90_driver); |