]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
can: m_can: m_can_config_endisable(): remove double clearing of clock stop request bit
authorSean Nyekjaer <sean@geanix.com>
Wed, 11 Dec 2019 06:32:27 +0000 (07:32 +0100)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 20 Jan 2021 13:26:04 +0000 (14:26 +0100)
BugLink: https://bugs.launchpad.net/bugs/1910822
[ Upstream commit c9f4cad6cdfe350ce2637e57f7f2aa7ff326bcc6 ]

The CSR bit is already cleared when arriving here so remove this section of
duplicate code.

The registers set in m_can_config_endisable() is set to same exact values as
before this patch.

Signed-off-by: Sean Nyekjaer <sean@geanix.com>
Acked-by: Sriram Dash <sriram.dash@samsung.com>
Acked-by: Dan Murphy <dmurphy@ti.com>
Link: https://lore.kernel.org/r/20191211063227.84259-1-sean@geanix.com
Fixes: f524f829b75a ("can: m_can: Create a m_can platform framework")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
drivers/net/can/m_can/m_can.c

index c84114b44ee07a16b6c3984cedbd8f82e4ceafca..d2bb9a87eff9a8677fd701ab616cfcd5bf0b755d 100644 (file)
@@ -379,10 +379,6 @@ void m_can_config_endisable(struct m_can_classdev *cdev, bool enable)
                cccr &= ~CCCR_CSR;
 
        if (enable) {
-               /* Clear the Clock stop request if it was set */
-               if (cccr & CCCR_CSR)
-                       cccr &= ~CCCR_CSR;
-
                /* enable m_can configuration */
                m_can_write(cdev, M_CAN_CCCR, cccr | CCCR_INIT);
                udelay(5);