can: flexcan: flexcan_rx_offload_setup(): factor out mailbox and rx-offload setup...

In an upcoming patch the order of operations in flexcan_open() are changed.
Introduce convenience function to make that patch simpler.

Link: https://lore.kernel.org/r/20201119100917.3013281-4-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 64c174a..0705b63 100644 (file)
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1346,6 +1346,47 @@ static void flexcan_ram_init(struct net_device *dev)
        priv->write(reg_ctrl2, &regs->ctrl2);
 }
 
+static int flexcan_rx_offload_setup(struct net_device *dev)
+{
+       struct flexcan_priv *priv = netdev_priv(dev);
+       int err;
+
+       if (priv->can.ctrlmode & CAN_CTRLMODE_FD)
+               priv->mb_size = sizeof(struct flexcan_mb) + CANFD_MAX_DLEN;
+       else
+               priv->mb_size = sizeof(struct flexcan_mb) + CAN_MAX_DLEN;
+       priv->mb_count = (sizeof(priv->regs->mb[0]) / priv->mb_size) +
+                        (sizeof(priv->regs->mb[1]) / priv->mb_size);
+
+       if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP)
+               priv->tx_mb_reserved =
+                       flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_OFF_TIMESTAMP);
+       else
+               priv->tx_mb_reserved =
+                       flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_OFF_FIFO);
+       priv->tx_mb_idx = priv->mb_count - 1;
+       priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
+       priv->tx_mask = FLEXCAN_IFLAG_MB(priv->tx_mb_idx);
+
+       priv->offload.mailbox_read = flexcan_mailbox_read;
+
+       if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
+               priv->offload.mb_first = FLEXCAN_RX_MB_OFF_TIMESTAMP_FIRST;
+               priv->offload.mb_last = priv->mb_count - 2;
+
+               priv->rx_mask = GENMASK_ULL(priv->offload.mb_last,
+                                           priv->offload.mb_first);
+               err = can_rx_offload_add_timestamp(dev, &priv->offload);
+       } else {
+               priv->rx_mask = FLEXCAN_IFLAG_RX_FIFO_OVERFLOW |
+                       FLEXCAN_IFLAG_RX_FIFO_AVAILABLE;
+               err = can_rx_offload_add_fifo(dev, &priv->offload,
+                                             FLEXCAN_NAPI_WEIGHT);
+       }
+
+       return err;
+}
+
 static void flexcan_chip_interrupts_enable(const struct net_device *dev)
 {
        const struct flexcan_priv *priv = netdev_priv(dev);
@@ -1675,38 +1716,7 @@ static int flexcan_open(struct net_device *dev)
        if (err)
                goto out_transceiver_disable;
 
-       if (priv->can.ctrlmode & CAN_CTRLMODE_FD)
-               priv->mb_size = sizeof(struct flexcan_mb) + CANFD_MAX_DLEN;
-       else
-               priv->mb_size = sizeof(struct flexcan_mb) + CAN_MAX_DLEN;
-       priv->mb_count = (sizeof(priv->regs->mb[0]) / priv->mb_size) +
-                        (sizeof(priv->regs->mb[1]) / priv->mb_size);
-
-       if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP)
-               priv->tx_mb_reserved =
-                       flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_OFF_TIMESTAMP);
-       else
-               priv->tx_mb_reserved =
-                       flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_OFF_FIFO);
-       priv->tx_mb_idx = priv->mb_count - 1;
-       priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
-       priv->tx_mask = FLEXCAN_IFLAG_MB(priv->tx_mb_idx);
-
-       priv->offload.mailbox_read = flexcan_mailbox_read;
-
-       if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
-               priv->offload.mb_first = FLEXCAN_RX_MB_OFF_TIMESTAMP_FIRST;
-               priv->offload.mb_last = priv->mb_count - 2;
-
-               priv->rx_mask = GENMASK_ULL(priv->offload.mb_last,
-                                           priv->offload.mb_first);
-               err = can_rx_offload_add_timestamp(dev, &priv->offload);
-       } else {
-               priv->rx_mask = FLEXCAN_IFLAG_RX_FIFO_OVERFLOW |
-                       FLEXCAN_IFLAG_RX_FIFO_AVAILABLE;
-               err = can_rx_offload_add_fifo(dev, &priv->offload,
-                                             FLEXCAN_NAPI_WEIGHT);
-       }
+       err = flexcan_rx_offload_setup(dev);
        if (err)
                goto out_free_irq;