Staging: comedi: addi-data: Cleanup redundant tests on unsigned

The variables are unsigned so the test `>= 0' is always true,
In these cases the other part of the test catch wrapped values.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
index ccb109a851f2d67f2b8462bebef2fb34b883164b..0af12fd2a40a79564108914c5a346a25f8cdff30 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
@@ -1386,8 +1386,7 @@ int i_APCI1710_ReadChronoValue(struct comedi_device *dev,
                                /* Test the timout parameter */
                 /*****************************/
 
-                               if ((ui_TimeOut >= 0)
-                                       && (ui_TimeOut <= 65535UL)) {
+                               if (ui_TimeOut <= 65535UL) {
 
                                        for (;;) {
                          /*******************/

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
index e9021cd4d34161319981f098f3b8b7d59a52c00f..723a97bab44c4605f511d7dfa61763bb06cbe7d4 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
@@ -150,7 +150,7 @@ int i_APCI1032_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdev
        unsigned int ui_TmpValue = 0;
        unsigned int ui_Channel;
        ui_Channel = CR_CHAN(insn->chanspec);
-       if (ui_Channel >= 0 && ui_Channel <= 31) {
+       if (ui_Channel <= 31) {
                ui_TmpValue = (unsigned int) inl(devpriv->iobase + APCI1032_DIGITAL_IP);
 /*
 * since only 1 channel reqd to bring it to last bit it is rotated 8

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
index 236b8a31c82421ef23437d87ed1dec901668171a..36b929ffecbd8ac33a0ed0e56b49c31bb0749c89 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
@@ -968,7 +968,7 @@ int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
 
        switch (data[0]) {
        case 0:
-               if (ui_Channel >= 0 && ui_Channel <= 15) {
+               if (ui_Channel <= 15) {
                        ui_TmpValue =
                                (unsigned int) inw(devpriv->i_IobaseAddon +
                                APCI1500_DIGITAL_IP);

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
index 38416356628d47e57ac1e0c67ca04812f4fd08ef..866eb8d758203804a3efe03cda1e4cf8b4c68eb0 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
@@ -79,7 +79,7 @@ int i_APCI1516_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdev
        unsigned int ui_TmpValue = 0;
        unsigned int ui_Channel;
        ui_Channel = CR_CHAN(insn->chanspec);
-       if (ui_Channel >= 0 && ui_Channel <= 7) {
+       if (ui_Channel <= 7) {
                ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI1516_DIGITAL_IP);
                /*   since only 1 channel reqd  to bring it to last bit it is rotated */
                /*   8 +(chan - 1) times then ANDed with 1 for last bit. */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
index 3a47c303422903cffbfd318b768ad833b49d373d..3ae663bc754e8ede587d75c0b012ca995ee1942d 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -154,7 +154,7 @@ int i_APCI1564_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdev
        unsigned int ui_Channel;
 
        ui_Channel = CR_CHAN(insn->chanspec);
-       if (ui_Channel >= 0 && ui_Channel <= 31) {
+       if (ui_Channel <= 31) {
                ui_TmpValue =
                        (unsigned int) inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP);
 /*

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
index 457917f292b76b7a0ee7b5faf814736c45041c54..d348cd5687aa8d62b87686a54d0d757fc1630a2e 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
@@ -117,7 +117,7 @@ int i_APCI2016_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
        unsigned int ui_NoOfChannel;
        unsigned int ui_Temp, ui_Temp1;
        ui_NoOfChannel = CR_CHAN(insn->chanspec);
-       if ((ui_NoOfChannel < 0) || (ui_NoOfChannel > 15)) {
+       if (ui_NoOfChannel > 15) {
                comedi_error(dev,
                        "Invalid Channel Numbers !!!, Channel Numbers must be between 0 and 15\n");
                return -EINVAL;
@@ -272,7 +272,7 @@ int i_APCI2016_BitsDigitalOutput(struct comedi_device *dev, struct comedi_subdev
        unsigned int ui_Temp;
        unsigned int ui_NoOfChannel;
        ui_NoOfChannel = CR_CHAN(insn->chanspec);
-       if ((ui_NoOfChannel < 0) || (ui_NoOfChannel > 15)) {
+       if (ui_NoOfChannel > 15) {
                comedi_error(dev,
                        "Invalid Channel Numbers !!!, Channel Numbers must be between 0 and 15\n");
                return -EINVAL;

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
index a853c62a4fd9c52d9988c5655b71bdaacd56e75b..aa159dccc36a858e1c04a303c8831c768406aae4 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
@@ -79,7 +79,7 @@ int i_APCI2200_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdev
        unsigned int ui_TmpValue = 0;
        unsigned int ui_Channel;
        ui_Channel = CR_CHAN(insn->chanspec);
-       if (ui_Channel >= 0 && ui_Channel <= 7) {
+       if (ui_Channel <= 7) {
                ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI2200_DIGITAL_IP);
                *data = (ui_TmpValue >> ui_Channel) & 0x1;
        }                       /* if(ui_Channel >= 0 && ui_Channel <=7) */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 169cee41b871b804ad93433428e917abf4cab175..222b5499dc0e073981034d043b39905769d76737 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -2350,7 +2350,7 @@ int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev,
        ui_Chan = CR_CHAN(insn->chanspec);      /*  channel specified */
 
        /* this_board->i_hwdrv_InsnReadDigitalInput(dev,ui_Chan,data); */
-       if (ui_Chan >= 0 && ui_Chan <= 3) {
+       if (ui_Chan <= 3) {
                ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI3120_RD_STATUS);
 
 /*
@@ -2539,8 +2539,7 @@ int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev,
                        "Not a valid Data !!! ,Data should be 1 or 0\n");
                return -EINVAL;
        }
-       if ((ui_NoOfChannel > (this_board->i_NbrDoChannel - 1))
-               || (ui_NoOfChannel < 0)) {
+       if (ui_NoOfChannel > this_board->i_NbrDoChannel - 1) {
                comedi_error(dev,
                        "This board doesn't have specified channel !!! \n");
                return -EINVAL;

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index 010697fa293690ed5857fc0f599f21a675274a54..98c23872e374ce9a4bff8cbd83569f579d365bb6 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -461,7 +461,7 @@ int i_APCI3200_GetChannelCalibrationValue(struct comedi_device *dev,
        if (s_BoardInfos[dev->minor].i_ConnectionType == 1) {
                /* if diff */
 
-               if ((ui_Channel_num >= 0) && (ui_Channel_num <= 1))
+               if (ui_Channel_num <= 1)
                        i_DiffChannel = ui_Channel_num, i_Module = 0;
                else if ((ui_Channel_num >= 2) && (ui_Channel_num <= 3))
                        i_DiffChannel = ui_Channel_num - 2, i_Module = 1;

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
index 338727879827611a05ecc81ef97cbab79090af7d..1d1e5fc2ea9a44feb3666597211f9939c77bdd78 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
@@ -148,7 +148,7 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device *dev,
                        /* Test the convert time value */
              /*******************************/
 
-                       if ((dw_ReloadValue >= 0) && (dw_ReloadValue <= 65535)) {
+                       if (dw_ReloadValue <= 65535) {
                                dw_TestReloadValue = dw_ReloadValue;
 
                                if (b_TimeBase == 1) {