[PATCH 2/8] can: flexcan: use struct canfd_frame for CAN classic frame

[Joakim Zhang]

This patch prepares for CAN FD mode, using struct canfd_frame can both
for classic format frame and fd format frame.

Signed-off-by: Joakim Zhang <qiangqing.zh...@nxp.com>
---
 drivers/net/can/flexcan.c    | 34 +++++++++++++++++-----------------
 drivers/net/can/rx-offload.c |  4 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 7e12f3db0915..5b0a159daa38 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -609,10 +609,10 @@ static int flexcan_get_berr_counter(const struct 
net_device *dev,
 static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device 
*dev)
 {
        const struct flexcan_priv *priv = netdev_priv(dev);
-       struct can_frame *cf = (struct can_frame *)skb->data;
+       struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
        u32 can_id;
        u32 data;
-       u32 ctrl = FLEXCAN_MB_CODE_TX_DATA | (cf->can_dlc << 16);
+       u32 ctrl = FLEXCAN_MB_CODE_TX_DATA | (cfd->len << 16);
        int i;
 
        if (can_dropped_invalid_skb(dev, skb))
@@ -620,18 +620,18 @@ static netdev_tx_t flexcan_start_xmit(struct sk_buff 
*skb, struct net_device *de
 
        netif_stop_queue(dev);
 
-       if (cf->can_id & CAN_EFF_FLAG) {
-               can_id = cf->can_id & CAN_EFF_MASK;
+       if (cfd->can_id & CAN_EFF_FLAG) {
+               can_id = cfd->can_id & CAN_EFF_MASK;
                ctrl |= FLEXCAN_MB_CNT_IDE | FLEXCAN_MB_CNT_SRR;
        } else {
-               can_id = (cf->can_id & CAN_SFF_MASK) << 18;
+               can_id = (cfd->can_id & CAN_SFF_MASK) << 18;
        }
 
-       if (cf->can_id & CAN_RTR_FLAG)
+       if (cfd->can_id & CAN_RTR_FLAG)
                ctrl |= FLEXCAN_MB_CNT_RTR;
 
-       for (i = 0; i < cf->can_dlc; i += sizeof(u32)) {
-               data = be32_to_cpup((__be32 *)&cf->data[i]);
+       for (i = 0; i < cfd->len; i += sizeof(u32)) {
+               data = be32_to_cpup((__be32 *)&cfd->data[i]);
                priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
        }
 
@@ -797,7 +797,7 @@ static unsigned int flexcan_mailbox_read(struct 
can_rx_offload *offload, bool dr
        struct flexcan_regs __iomem *regs = priv->regs;
        struct flexcan_mb __iomem *mb;
        u32 reg_ctrl, reg_id, reg_iflag1;
-       struct can_frame *cf = NULL;
+       struct canfd_frame *cfd = NULL;
        int i;
 
        mb = flexcan_get_mb(priv, n);
@@ -829,25 +829,25 @@ static unsigned int flexcan_mailbox_read(struct 
can_rx_offload *offload, bool dr
        }
 
        if (!drop)
-               *skb = alloc_can_skb(offload->dev, &cf);
+               *skb = alloc_can_skb(offload->dev, (struct can_frame **)&cfd);
 
-       if (*skb && cf) {
+       if (*skb && cfd) {
                /* increase timstamp to full 32 bit */
                *timestamp = reg_ctrl << 16;
 
                reg_id = priv->read(&mb->can_id);
                if (reg_ctrl & FLEXCAN_MB_CNT_IDE)
-                       cf->can_id = ((reg_id >> 0) & CAN_EFF_MASK) | 
CAN_EFF_FLAG;
+                       cfd->can_id = ((reg_id >> 0) & CAN_EFF_MASK) | 
CAN_EFF_FLAG;
                else
-                       cf->can_id = (reg_id >> 18) & CAN_SFF_MASK;
+                       cfd->can_id = (reg_id >> 18) & CAN_SFF_MASK;
 
                if (reg_ctrl & FLEXCAN_MB_CNT_RTR)
-                       cf->can_id |= CAN_RTR_FLAG;
-               cf->can_dlc = get_can_dlc((reg_ctrl >> 16) & 0xf);
+                       cfd->can_id |= CAN_RTR_FLAG;
+               cfd->len = get_can_dlc((reg_ctrl >> 16) & 0x0F);
 
-               for (i = 0; i < cf->can_dlc; i += sizeof(u32)) {
+               for (i = 0; i < cfd->len; i += sizeof(u32)) {
                        __be32 data = cpu_to_be32(priv->read(&mb->data[i / 
sizeof(u32)]));
-                       *(__be32 *)(cf->data + i) = data;
+                       *(__be32 *)(cfd->data + i) = data;
                }
        }
 
diff --git a/drivers/net/can/rx-offload.c b/drivers/net/can/rx-offload.c
index 632919484ff7..9f8c8410e19e 100644
--- a/drivers/net/can/rx-offload.c
+++ b/drivers/net/can/rx-offload.c
@@ -55,11 +55,11 @@ static int can_rx_offload_napi_poll(struct napi_struct 
*napi, int quota)
 
        while ((work_done < quota) &&
               (skb = skb_dequeue(&offload->skb_queue))) {
-               struct can_frame *cf = (struct can_frame *)skb->data;
+               struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
 
                work_done++;
                stats->rx_packets++;
-               stats->rx_bytes += cf->can_dlc;
+               stats->rx_bytes += cfd->len;
                netif_receive_skb(skb);
        }
 
-- 
2.17.1