mfd: ab8500-debugfs: Simplify invalid debugfs data checking

Noticed during a coding review, if we reorganised the checking a
little, we can rid the code of a pointless 'else'.  Whilst looking
for this particular code hunk I noticed another pointless 'else',
which I've subsequently fixed in this patch.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
index e23fcbad79d6577e935d92589e0ed46da3d6d14b..f7f271c16f2ce287e408074577337b62a0725667 100644 (file)
--- a/drivers/mfd/ab8500-debugfs.c
+++ b/drivers/mfd/ab8500-debugfs.c
@@ -2503,14 +2503,14 @@ static ssize_t ab8500_gpadc_trig_timer_write(struct file *file,
        if (err)
                return err;
 
-       if (user_trig_timer <= 255) {
-               trig_timer = (u8) user_trig_timer;
-       } else {
-               dev_err(dev, "debugfs error input: "
-                       "should be beetween 0 to 255\n");
+       if (user_trig_timer & ~0xFF) {
+               dev_err(dev,
+                       "debugfs error input: should be beetween 0 to 255\n");
                return -EINVAL;
        }
 
+       trig_timer = (u8) user_trig_timer;
+
        return count;
 }
 
@@ -2764,8 +2764,8 @@ static ssize_t show_irq(struct device *dev,
        irq_index = name - irq_first;
        if (irq_index >= num_irqs)
                return -EINVAL;
-       else
-               return sprintf(buf, "%u\n", irq_count[irq_index]);
+
+       return sprintf(buf, "%u\n", irq_count[irq_index]);
 }
 
 static ssize_t ab8500_subscribe_write(struct file *file,