Commit 69d98969 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Marc Kleine-Budde
Browse files

can: rename get_can_dlc() macro with can_cc_dlc2len() 



The get_can_dlc() macro is used to ensure the payload length information of
the Classical CAN frame to be max 8 bytes (the CAN_MAX_DLEN).

Rename the macro and use the correct constant in preparation of the len/dlc
cleanup for Classical CAN frames.

Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20201110101852.1973-3-socketcan@hartkopp.net


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent ea780056

drivers/net/can/at91_can.c

+1 −1
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb, 
		cf->can_id = (reg_mid >> 18) & CAN_SFF_MASK;



	reg_msr = at91_read(priv, AT91_MSR(mb));

	cf->can_dlc = get_can_dlc((reg_msr >> 16) & 0xf);

	cf->can_dlc = can_cc_dlc2len((reg_msr >> 16) & 0xf);



	if (reg_msr & AT91_MSR_MRTR)

		cf->can_id |= CAN_RTR_FLAG;

drivers/net/can/c_can/c_can.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, u32 ctrl) 
		return -ENOMEM;

	}



	frame->can_dlc = get_can_dlc(ctrl & 0x0F);

	frame->can_dlc = can_cc_dlc2len(ctrl & 0x0F);



	arb = priv->read_reg32(priv, C_CAN_IFACE(ARB1_REG, iface));

drivers/net/can/cc770/cc770.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static void cc770_rx(struct net_device *dev, unsigned int mo, u8 ctrl1) 
		}



		cf->can_id = id;

		cf->can_dlc = get_can_dlc((config & 0xf0) >> 4);

		cf->can_dlc = can_cc_dlc2len((config & 0xf0) >> 4);

		for (i = 0; i < cf->can_dlc; i++)

			cf->data[i] = cc770_read_reg(priv, msgobj[mo].data[i]);

	}

drivers/net/can/flexcan.c

+1 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ static struct sk_buff *flexcan_mailbox_read(struct can_rx_offload *offload, 
		if (reg_ctrl & FLEXCAN_MB_CNT_BRS)

			cfd->flags |= CANFD_BRS;

	} else {

		cfd->len = get_can_dlc((reg_ctrl >> 16) & 0xf);

		cfd->len = can_cc_dlc2len((reg_ctrl >> 16) & 0xf);



		if (reg_ctrl & FLEXCAN_MB_CNT_RTR)

			cfd->can_id |= CAN_RTR_FLAG;

drivers/net/can/grcan.c

+1 −1
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ static int grcan_receive(struct net_device *dev, int budget) 
			cf->can_id = ((slot[0] & GRCAN_MSG_BID)

				      >> GRCAN_MSG_BID_BIT);

		}

		cf->can_dlc = get_can_dlc((slot[1] & GRCAN_MSG_DLC)

		cf->can_dlc = can_cc_dlc2len((slot[1] & GRCAN_MSG_DLC)

					  >> GRCAN_MSG_DLC_BIT);

		if (rtr) {

			cf->can_id |= CAN_RTR_FLAG;