These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / iio / adc / ad7606_par.c

diff --git a/kernel/drivers/staging/iio/adc/ad7606_par.c b/kernel/drivers/staging/iio/adc/ad7606_par.c
index 9e24b4d..adc370e 100644 (file)
--- a/kernel/drivers/staging/iio/adc/ad7606_par.c
+++ b/kernel/drivers/staging/iio/adc/ad7606_par.c
@@ -16,13 +16,13 @@
 #include "ad7606.h"
 
 static int ad7606_par16_read_block(struct device *dev,
-                                int count, void *buf)
+                                  int count, void *buf)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct iio_dev *indio_dev = platform_get_drvdata(pdev);
        struct ad7606_state *st = iio_priv(indio_dev);
 
-       insw((unsigned long) st->base_address, buf, count);
+       insw((unsigned long)st->base_address, buf, count);
 
        return 0;
 }
@@ -32,13 +32,13 @@ static const struct ad7606_bus_ops ad7606_par16_bops = {
 };
 
 static int ad7606_par8_read_block(struct device *dev,
-                                int count, void *buf)
+                                 int count, void *buf)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct iio_dev *indio_dev = platform_get_drvdata(pdev);
        struct ad7606_state *st = iio_priv(indio_dev);
 
-       insb((unsigned long) st->base_address, buf, count * 2);
+       insb((unsigned long)st->base_address, buf, count * 2);
 
        return 0;
 }
@@ -69,9 +69,9 @@ static int ad7606_par_probe(struct platform_device *pdev)
        remap_size = resource_size(res);
 
        indio_dev = ad7606_probe(&pdev->dev, irq, addr,
-                         platform_get_device_id(pdev)->driver_data,
-                         remap_size > 1 ? &ad7606_par16_bops :
-                         &ad7606_par8_bops);
+                                platform_get_device_id(pdev)->driver_data,
+                                remap_size > 1 ? &ad7606_par16_bops :
+                                &ad7606_par8_bops);
 
        if (IS_ERR(indio_dev))
                return PTR_ERR(indio_dev);
@@ -113,13 +113,14 @@ static const struct dev_pm_ops ad7606_pm_ops = {
        .suspend = ad7606_par_suspend,
        .resume  = ad7606_par_resume,
 };
+
 #define AD7606_PAR_PM_OPS (&ad7606_pm_ops)
 
 #else
 #define AD7606_PAR_PM_OPS NULL
 #endif  /* CONFIG_PM */
 
-static struct platform_device_id ad7606_driver_ids[] = {
+static const struct platform_device_id ad7606_driver_ids[] = {
        {
                .name           = "ad7606-8",
                .driver_data    = ID_AD7606_8,