can: mcp251xfd: mcp251xfd_chip_clock_enable(): simplify return

marckleinebudde · marckleinebudde · commit dfe99ba29e62 · 2021-01-29T09:31:58.000+01:00
This patch simplifies the return of the mcp251xfd_chip_clock_enable() function by direct returning the error. Link: https://lore.kernel.org/r/20210128104644.2982125-8-mkl@pengutronix.de Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
@@ -596,11 +596,9 @@ static int mcp251xfd_chip_clock_enable(const struct mcp251xfd_priv *priv)
 			   "Timeout waiting for Oscillator Ready (osc=0x%08x, osc_reference=0x%08x)\n",
 			   osc, osc_reference);
 		return -ETIMEDOUT;
-	} else if (err) {
-		return err;
 	}
 
-	return 0;
+	return err;
 }
 
 static int mcp251xfd_chip_softreset_do(const struct mcp251xfd_priv *priv)

Original file line number	Diff line number	Diff line change
`@@ -596,11 +596,9 @@ static int mcp251xfd_chip_clock_enable(const struct mcp251xfd_priv *priv)`
`596`	`596`	`"Timeout waiting for Oscillator Ready (osc=0x%08x, osc_reference=0x%08x)\n",`
`597`	`597`	`osc, osc_reference);`
`598`	`598`	`return -ETIMEDOUT;`
`599`		`- } else if (err) {`
`600`		`- return err;`
`601`	`599`	`}`
`602`	`600`
`603`		`- return 0;`
	`601`	`+ return err;`
`604`	`602`	`}`
`605`	`603`
`606`	`604`	`static int mcp251xfd_chip_softreset_do(const struct mcp251xfd_priv *priv)`