Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / counter / microchip-tcb-capture.c

diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c
index 039c54a..710acc0 100644 (file)
--- a/drivers/counter/microchip-tcb-capture.c
+++ b/drivers/counter/microchip-tcb-capture.c
@@ -183,16 +183,20 @@ static int mchp_tc_count_action_get(struct counter_device *counter,
 
        regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], CMR), &cmr);
 
-       *action = MCHP_TC_SYNAPSE_ACTION_NONE;
-
-       if (cmr & ATMEL_TC_ETRGEDG_NONE)
+       switch (cmr & ATMEL_TC_ETRGEDG) {
+       default:
                *action = MCHP_TC_SYNAPSE_ACTION_NONE;
-       else if (cmr & ATMEL_TC_ETRGEDG_RISING)
+               break;
+       case ATMEL_TC_ETRGEDG_RISING:
                *action = MCHP_TC_SYNAPSE_ACTION_RISING_EDGE;
-       else if (cmr & ATMEL_TC_ETRGEDG_FALLING)
+               break;
+       case ATMEL_TC_ETRGEDG_FALLING:
                *action = MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE;
-       else if (cmr & ATMEL_TC_ETRGEDG_BOTH)
+               break;
+       case ATMEL_TC_ETRGEDG_BOTH:
                *action = MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE;
+               break;
+       }
 
        return 0;
 }