From: Marc Kleine-Budde Date: Fri, 16 Oct 2020 18:49:30 +0000 (+0200) Subject: can: mcp251xfd: mcp251xfd_chip_clock_enable(): simplify return X-Git-Tag: v5.12-rc1~200^2~200^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfe99ba29e6283d0533ca9bf5135c5a6c0f7a952;p=thirdparty%2Fkernel%2Flinux.git can: mcp251xfd: mcp251xfd_chip_clock_enable(): simplify return 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 --- diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c index 04870a741792d..da5e8e4164403 100644 --- 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)