Merge 3.8-rc5 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / iio / adc / mxs-lradc.c

diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index c5ceb9d90ea83a696a4ca4518dc379a2c6a82831..eca07045f4de26d00e5cb228ccb203021bbf6174 100644 (file)
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -75,11 +75,6 @@ static const char * const mxs_lradc_irq_name[] = {
        "mxs-lradc-button1",
 };
 
-struct mxs_lradc_chan {
-       uint8_t                         slot;
-       uint8_t                         flags;
-};
-
 struct mxs_lradc {
        struct device           *dev;
        void __iomem            *base;
@@ -90,8 +85,6 @@ struct mxs_lradc {
 
        struct mutex            lock;
 
-       uint8_t                 enable;
-
        struct completion       completion;
 };