tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20201110101852.1973-4-socketcan@hartkopp.net
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

authored by

Oliver Hartkopp and committed by
Marc Kleine-Budde cd1124e7 69d98969

+6 -7
+1 -1
drivers/net/can/flexcan.c
··· 1000 1000 cfd->can_id = (reg_id >> 18) & CAN_SFF_MASK; 1001 1001 1002 1002 if (reg_ctrl & FLEXCAN_MB_CNT_EDL) { 1003 - cfd->len = can_dlc2len(get_canfd_dlc((reg_ctrl >> 16) & 0xf)); 1003 + cfd->len = can_dlc2len((reg_ctrl >> 16) & 0xf); 1004 1004 1005 1005 if (reg_ctrl & FLEXCAN_MB_CNT_BRS) 1006 1006 cfd->flags |= CANFD_BRS;
+1 -1
drivers/net/can/peak_canfd/peak_canfd.c
··· 257 257 u8 cf_len; 258 258 259 259 if (rx_msg_flags & PUCAN_MSG_EXT_DATA_LEN) 260 - cf_len = can_dlc2len(get_canfd_dlc(pucan_msg_get_dlc(msg))); 260 + cf_len = can_dlc2len(pucan_msg_get_dlc(msg)); 261 261 else 262 262 cf_len = can_cc_dlc2len(pucan_msg_get_dlc(msg)); 263 263
+1 -1
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
··· 1405 1405 cfd->flags |= CANFD_BRS; 1406 1406 1407 1407 dlc = FIELD_GET(MCP251XFD_OBJ_FLAGS_DLC, hw_rx_obj->flags); 1408 - cfd->len = can_dlc2len(get_canfd_dlc(dlc)); 1408 + cfd->len = can_dlc2len(dlc); 1409 1409 } else { 1410 1410 if (hw_rx_obj->flags & MCP251XFD_OBJ_FLAGS_RTR) 1411 1411 cfd->can_id |= CAN_RTR_FLAG;
+1 -1
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
··· 1251 1251 kvaser_usb_can_rx_over_error(priv->netdev); 1252 1252 1253 1253 if (flags & KVASER_USB_HYDRA_CF_FLAG_FDF) { 1254 - cf->len = can_dlc2len(get_canfd_dlc(dlc)); 1254 + cf->len = can_dlc2len(dlc); 1255 1255 if (flags & KVASER_USB_HYDRA_CF_FLAG_BRS) 1256 1256 cf->flags |= CANFD_BRS; 1257 1257 if (flags & KVASER_USB_HYDRA_CF_FLAG_ESI)
+1 -1
drivers/net/can/usb/peak_usb/pcan_usb_fd.c
··· 492 492 if (rx_msg_flags & PUCAN_MSG_ERROR_STATE_IND) 493 493 cfd->flags |= CANFD_ESI; 494 494 495 - cfd->len = can_dlc2len(get_canfd_dlc(pucan_msg_get_dlc(rm))); 495 + cfd->len = can_dlc2len(pucan_msg_get_dlc(rm)); 496 496 } else { 497 497 /* CAN 2.0 frame case */ 498 498 skb = alloc_can_skb(netdev, (struct can_frame **)&cfd);
-1
include/linux/can/dev.h
··· 105 105 * ISO 11898-1 Chapter 8.4.2.3 (DLC field) 106 106 */ 107 107 #define can_cc_dlc2len(dlc) (min_t(u8, (dlc), CAN_MAX_DLEN)) 108 - #define get_canfd_dlc(dlc) (min_t(u8, (dlc), CANFD_MAX_DLC)) 109 108 110 109 /* Check for outgoing skbs that have not been created by the CAN subsystem */ 111 110 static inline bool can_skb_headroom_valid(struct net_device *dev,
+1 -1
include/linux/can/dev/peak_canfd.h
··· 282 282 } 283 283 284 284 /* return the dlc value from any received message channel_dlc field */ 285 - static inline int pucan_msg_get_dlc(const struct pucan_rx_msg *msg) 285 + static inline u8 pucan_msg_get_dlc(const struct pucan_rx_msg *msg) 286 286 { 287 287 return msg->channel_dlc >> 4; 288 288 }