OSDN Git Service

can: mcp251xfd: mcp251xfd_regmap_crc_read_one(): Factor out crc check into separate...
authorMarc Kleine-Budde <mkl@pengutronix.de>
Mon, 15 Mar 2021 07:59:15 +0000 (08:59 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 7 Apr 2021 07:31:28 +0000 (09:31 +0200)
This patch factors out the crc check into a separate function. This is
preparation for the next patch.

Link: https://lore.kernel.org/r/20210406110617.1865592-4-mkl@pengutronix.de
Cc: Manivannan Sadhasivam <mani@kernel.org>
Cc: Thomas Kopp <thomas.kopp@microchip.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c

index 314f868..35557ac 100644 (file)
@@ -233,12 +233,30 @@ mcp251xfd_regmap_crc_write(void *context,
 }
 
 static int
+mcp251xfd_regmap_crc_read_check_crc(const struct mcp251xfd_map_buf_crc * const buf_rx,
+                                   const struct mcp251xfd_map_buf_crc * const buf_tx,
+                                   unsigned int data_len)
+{
+       u16 crc_received, crc_calculated;
+
+       crc_received = get_unaligned_be16(buf_rx->data + data_len);
+       crc_calculated = mcp251xfd_crc16_compute2(&buf_tx->cmd,
+                                                 sizeof(buf_tx->cmd),
+                                                 buf_rx->data,
+                                                 data_len);
+       if (crc_received != crc_calculated)
+               return -EBADMSG;
+
+       return 0;
+}
+
+
+static int
 mcp251xfd_regmap_crc_read_one(struct mcp251xfd_priv *priv,
                              struct spi_message *msg, unsigned int data_len)
 {
        const struct mcp251xfd_map_buf_crc *buf_rx = priv->map_buf_crc_rx;
        const struct mcp251xfd_map_buf_crc *buf_tx = priv->map_buf_crc_tx;
-       u16 crc_received, crc_calculated;
        int err;
 
        BUILD_BUG_ON(sizeof(buf_rx->cmd) != sizeof(__be16) + sizeof(u8));
@@ -248,15 +266,7 @@ mcp251xfd_regmap_crc_read_one(struct mcp251xfd_priv *priv,
        if (err)
                return err;
 
-       crc_received = get_unaligned_be16(buf_rx->data + data_len);
-       crc_calculated = mcp251xfd_crc16_compute2(&buf_tx->cmd,
-                                                 sizeof(buf_tx->cmd),
-                                                 buf_rx->data,
-                                                 data_len);
-       if (crc_received != crc_calculated)
-               return -EBADMSG;
-
-       return 0;
+       return mcp251xfd_regmap_crc_read_check_crc(buf_rx, buf_tx, data_len);
 }
 
 static int