]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
can: kvaser_pciefd: kvaser_pciefd_pwm_stop(): remove unnecessary code when setting...
authorChrister Beskow <chbe@kvaser.com>
Tue, 6 Aug 2019 07:29:38 +0000 (09:29 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 13 Aug 2019 14:36:52 +0000 (16:36 +0200)
To set the duty cycle to zero (i.e. pwm_stop), the trigger value shall
be equal to the top value.

This is achieved by reading the value of the top bit field from the pwm
register and then writing back this value to the trigger and top bit
fields.

Addresses-Coverity: ("Logically dead code")
Reported-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Christer Beskow <chbe@kvaser.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/kvaser_pciefd.c

index 3af747cbbde44ee9aa8778e8616295937d4b403f..ccba42c544a30209b362b0892a7afb6689740380 100644 (file)
@@ -643,7 +643,7 @@ static int kvaser_pciefd_bus_on(struct kvaser_pciefd_can *can)
 
 static void kvaser_pciefd_pwm_stop(struct kvaser_pciefd_can *can)
 {
-       int top, trigger;
+       u8 top;
        u32 pwm_ctrl;
        unsigned long irq;
 
@@ -651,12 +651,8 @@ static void kvaser_pciefd_pwm_stop(struct kvaser_pciefd_can *can)
        pwm_ctrl = ioread32(can->reg_base + KVASER_PCIEFD_KCAN_PWM_REG);
        top = (pwm_ctrl >> KVASER_PCIEFD_KCAN_PWM_TOP_SHIFT) & 0xff;
 
-       trigger = (100 * top + 50) / 100;
-       if (trigger < 0)
-               trigger = 0;
-
-       pwm_ctrl = trigger & 0xff;
-       pwm_ctrl |= (top & 0xff) << KVASER_PCIEFD_KCAN_PWM_TOP_SHIFT;
+       /* Set duty cycle to zero */
+       pwm_ctrl |= top;
        iowrite32(pwm_ctrl, can->reg_base + KVASER_PCIEFD_KCAN_PWM_REG);
        spin_unlock_irqrestore(&can->lock, irq);
 }