OSDN Git Service

staging: comedi: addi_common.h: remove 'b_SingleDiff' from private data
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Thu, 29 May 2014 17:30:00 +0000 (10:30 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jun 2014 21:39:37 +0000 (14:39 -0700)
This member is set but never used. Just remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/addi-data/addi_common.c
drivers/staging/comedi/drivers/addi-data/addi_common.h
drivers/staging/comedi/drivers/addi_apci_3120.c

index dc87df0..de5843a 100644 (file)
@@ -157,14 +157,10 @@ static int addi_auto_attach(struct comedi_device *dev,
                s->subdev_flags =
                        SDF_READABLE | SDF_COMMON | SDF_GROUND
                        | SDF_DIFF;
-               if (devpriv->s_EeParameters.i_NbrAiChannel) {
-                       s->n_chan =
-                               devpriv->s_EeParameters.i_NbrAiChannel;
-                       devpriv->b_SingelDiff = 0;
-               } else {
+               if (devpriv->s_EeParameters.i_NbrAiChannel)
+                       s->n_chan = devpriv->s_EeParameters.i_NbrAiChannel;
+               else
                        s->n_chan = this_board->i_NbrAiChannelDiff;
-                       devpriv->b_SingelDiff = 1;
-               }
                s->maxdata = devpriv->s_EeParameters.i_AiMaxdata;
                s->len_chanlist = this_board->i_AiChannelList;
                s->range_table = this_board->pr_AiRangelist;
index 5c6a11c..080bb6b 100644 (file)
@@ -141,7 +141,6 @@ struct addi_private {
        unsigned char b_InterruptMode;  /*  eoc eos or dma */
        unsigned char b_EocEosInterrupt;        /*  Enable disable eoc eos interrupt */
        unsigned int ui_EocEosConversionTime;
-       unsigned char b_SingelDiff;
        unsigned char b_ExttrigEnable;  /* To enable or disable external trigger */
 
        /* Pointer to the current process */
index 0cfb12f..cc4f586 100644 (file)
@@ -125,13 +125,10 @@ static int apci3120_auto_attach(struct comedi_device *dev,
        s->subdev_flags =
                SDF_READABLE | SDF_COMMON | SDF_GROUND
                | SDF_DIFF;
-       if (this_board->i_NbrAiChannel) {
+       if (this_board->i_NbrAiChannel)
                s->n_chan = this_board->i_NbrAiChannel;
-               devpriv->b_SingelDiff = 0;
-       } else {
+       else
                s->n_chan = this_board->i_NbrAiChannelDiff;
-               devpriv->b_SingelDiff = 1;
-       }
        s->maxdata = this_board->i_AiMaxdata;
        s->len_chanlist = this_board->i_AiChannelList;
        s->range_table = &range_apci3120_ai;