[PATCH 5.4 261/453] can: m_can: m_can_config_endisable(): remove double clearing of clock stop request bit

From: Greg Kroah-Hartman
Date: Mon Dec 28 2020 - 08:50:21 EST


From: Sean Nyekjaer <sean@xxxxxxxxxx>

[ 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@xxxxxxxxxx>
Acked-by: Sriram Dash <sriram.dash@xxxxxxxxxxx>
Acked-by: Dan Murphy <dmurphy@xxxxxx>
Link: https://lore.kernel.org/r/20191211063227.84259-1-sean@xxxxxxxxxx
Fixes: f524f829b75a ("can: m_can: Create a m_can platform framework")
Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
drivers/net/can/m_can/m_can.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index c84114b44ee07..d2bb9a87eff9a 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -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);
--
2.27.0