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

can: remove obsolete get_canfd_dlc() macro 



The macro was always used together with can_dlc2len() which sanitizes the
given dlc value on its own.

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


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

drivers/net/can/flexcan.c

+1 −1
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ static struct sk_buff *flexcan_mailbox_read(struct can_rx_offload *offload, 
		cfd->can_id = (reg_id >> 18) & CAN_SFF_MASK;



	if (reg_ctrl & FLEXCAN_MB_CNT_EDL) {

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

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



		if (reg_ctrl & FLEXCAN_MB_CNT_BRS)

			cfd->flags |= CANFD_BRS;

drivers/net/can/peak_canfd/peak_canfd.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int pucan_handle_can_rx(struct peak_canfd_priv *priv, 
	u8 cf_len;



	if (rx_msg_flags & PUCAN_MSG_EXT_DATA_LEN)

		cf_len = can_dlc2len(get_canfd_dlc(pucan_msg_get_dlc(msg)));

		cf_len = can_dlc2len(pucan_msg_get_dlc(msg));

	else

		cf_len = can_cc_dlc2len(pucan_msg_get_dlc(msg));

drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ mcp251xfd_hw_rx_obj_to_skb(const struct mcp251xfd_priv *priv, 
			cfd->flags |= CANFD_BRS;



		dlc = FIELD_GET(MCP251XFD_OBJ_FLAGS_DLC, hw_rx_obj->flags);

		cfd->len = can_dlc2len(get_canfd_dlc(dlc));

		cfd->len = can_dlc2len(dlc);

	} else {

		if (hw_rx_obj->flags & MCP251XFD_OBJ_FLAGS_RTR)

			cfd->can_id |= CAN_RTR_FLAG;

drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c

+1 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ static void kvaser_usb_hydra_rx_msg_ext(const struct kvaser_usb *dev, 
		kvaser_usb_can_rx_over_error(priv->netdev);



	if (flags & KVASER_USB_HYDRA_CF_FLAG_FDF) {

		cf->len = can_dlc2len(get_canfd_dlc(dlc));

		cf->len = can_dlc2len(dlc);

		if (flags & KVASER_USB_HYDRA_CF_FLAG_BRS)

			cf->flags |= CANFD_BRS;

		if (flags & KVASER_USB_HYDRA_CF_FLAG_ESI)

drivers/net/can/usb/peak_usb/pcan_usb_fd.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static int pcan_usb_fd_decode_canmsg(struct pcan_usb_fd_if *usb_if, 
		if (rx_msg_flags & PUCAN_MSG_ERROR_STATE_IND)

			cfd->flags |= CANFD_ESI;



		cfd->len = can_dlc2len(get_canfd_dlc(pucan_msg_get_dlc(rm)));

		cfd->len = can_dlc2len(pucan_msg_get_dlc(rm));

	} else {

		/* CAN 2.0 frame case */

		skb = alloc_can_skb(netdev, (struct can_frame **)&cfd);