can: esd_usb: Use consistent prefix ESD_USB_ for macros

Rename the following macros:
- ESD_RTR to ESD_USB_RTR
- ESD_EV_CAN_ERROR_EXT to ESD_USB_EV_CAN_ERROR_EXT

Additionally remove the double newline trailing to definition
of ESD_USB_RTR.

Signed-off-by: Frank Jungclaus <frank.jungclaus@esd.eu>
Link: https://lore.kernel.org/r/20230523173105.3175086-3-frank.jungclaus@esd.eu
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/usb/esd_usb.c b/drivers/net/can/usb/esd_usb.c
index d40a04db745822bfb42cf6e96648fa0f50139fa9..6201637ac0ff2056ca08f9803bbc826947858bfa 100644 (file)
--- a/drivers/net/can/usb/esd_usb.c
+++ b/drivers/net/can/usb/esd_usb.c
@@ -43,8 +43,7 @@ MODULE_LICENSE("GPL v2");
 #define ESD_USB_CMD_IDADD              6 /* also used for IDADD_REPLY */
 
 /* esd CAN message flags - dlc field */
-#define ESD_RTR        BIT(4)
-
+#define ESD_USB_RTR    BIT(4)
 
 /* esd CAN message flags - id field */
 #define ESD_USB_EXTID  BIT(29)
@@ -52,7 +51,7 @@ MODULE_LICENSE("GPL v2");
 #define ESD_USB_IDMASK GENMASK(28, 0)
 
 /* esd CAN event ids */
-#define ESD_EV_CAN_ERROR_EXT   2 /* CAN controller specific diagnostic data */
+#define ESD_USB_EV_CAN_ERROR_EXT       2 /* CAN controller specific diagnostic data */
 
 /* baudrate message flags */
 #define ESD_USB_LOM    BIT(30) /* Listen Only Mode */
@@ -228,7 +227,7 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv,
        struct sk_buff *skb;
        u32 id = le32_to_cpu(msg->rx.id) & ESD_USB_IDMASK;
 
-       if (id == ESD_EV_CAN_ERROR_EXT) {
+       if (id == ESD_USB_EV_CAN_ERROR_EXT) {
                u8 state = msg->rx.ev_can_err_ext.status;
                u8 ecc = msg->rx.ev_can_err_ext.ecc;
 
@@ -341,13 +340,13 @@ static void esd_usb_rx_can_msg(struct esd_usb_net_priv *priv,
                }
 
                cf->can_id = id & ESD_USB_IDMASK;
-               can_frame_set_cc_len(cf, msg->rx.dlc & ~ESD_RTR,
+               can_frame_set_cc_len(cf, msg->rx.dlc & ~ESD_USB_RTR,
                                     priv->can.ctrlmode);
 
                if (id & ESD_USB_EXTID)
                        cf->can_id |= CAN_EFF_FLAG;
 
-               if (msg->rx.dlc & ESD_RTR) {
+               if (msg->rx.dlc & ESD_USB_RTR) {
                        cf->can_id |= CAN_RTR_FLAG;
                } else {
                        for (i = 0; i < cf->len; i++)
@@ -767,7 +766,7 @@ static netdev_tx_t esd_usb_start_xmit(struct sk_buff *skb,
        msg->tx.id = cpu_to_le32(cf->can_id & CAN_ERR_MASK);
 
        if (cf->can_id & CAN_RTR_FLAG)
-               msg->tx.dlc |= ESD_RTR;
+               msg->tx.dlc |= ESD_USB_RTR;
 
        if (cf->can_id & CAN_EFF_FLAG)
                msg->tx.id |= cpu_to_le32(ESD_USB_EXTID);