can: kvaser_usb: kvaser_usb_leaf: Rename {leaf,usbcan}_cmd_error_event to {leaf,usbca...

[ Upstream commit 7ea56128dbf904a3359bcf9289cccdfa3c85c7e8 ]

Prepare for handling CMD_ERROR_EVENT. Rename struct
{leaf,usbcan}_cmd_error_event to {leaf,usbcan}_cmd_can_error_event.

Fixes: d9f21bf91c45 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices")
Reported-by: Anssi Hannula <anssi.hannula@bitwise.fi>
Tested-by: Anssi Hannula <anssi.hannula@bitwise.fi>
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Link: https://lore.kernel.org/all/20221010185237.319219-4-extja@kvaser.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
index 26f32828f9052eec791e758596acf94f6f64271c..4f3d1150b2b21b7a921625bac97f13046aef58ad 100644 (file)
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
@@ -233,7 +233,7 @@ struct kvaser_cmd_tx_acknowledge_header {
        u8 tid;
 } __packed;
 
-struct leaf_cmd_error_event {
+struct leaf_cmd_can_error_event {
        u8 tid;
        u8 flags;
        __le16 time[3];
@@ -245,7 +245,7 @@ struct leaf_cmd_error_event {
        u8 error_factor;
 } __packed;
 
-struct usbcan_cmd_error_event {
+struct usbcan_cmd_can_error_event {
        u8 tid;
        u8 padding;
        u8 tx_errors_count_ch0;
@@ -318,7 +318,7 @@ struct kvaser_cmd {
                        struct leaf_cmd_softinfo softinfo;
                        struct leaf_cmd_rx_can rx_can;
                        struct leaf_cmd_chip_state_event chip_state_event;
-                       struct leaf_cmd_error_event error_event;
+                       struct leaf_cmd_can_error_event can_error_event;
                        struct leaf_cmd_log_message log_message;
                        struct kvaser_cmd_cap_req cap_req;
                        struct kvaser_cmd_cap_res cap_res;
@@ -328,7 +328,7 @@ struct kvaser_cmd {
                        struct usbcan_cmd_softinfo softinfo;
                        struct usbcan_cmd_rx_can rx_can;
                        struct usbcan_cmd_chip_state_event chip_state_event;
-                       struct usbcan_cmd_error_event error_event;
+                       struct usbcan_cmd_can_error_event can_error_event;
                } __packed usbcan;
 
                struct kvaser_cmd_tx_can tx_can;
@@ -350,7 +350,7 @@ static const u8 kvaser_usb_leaf_cmd_sizes_leaf[] = {
        [CMD_RX_EXT_MESSAGE]            = kvaser_fsize(u.leaf.rx_can),
        [CMD_LEAF_LOG_MESSAGE]          = kvaser_fsize(u.leaf.log_message),
        [CMD_CHIP_STATE_EVENT]          = kvaser_fsize(u.leaf.chip_state_event),
-       [CMD_CAN_ERROR_EVENT]           = kvaser_fsize(u.leaf.error_event),
+       [CMD_CAN_ERROR_EVENT]           = kvaser_fsize(u.leaf.can_error_event),
        [CMD_GET_CAPABILITIES_RESP]     = kvaser_fsize(u.leaf.cap_res),
        /* ignored events: */
        [CMD_FLUSH_QUEUE_REPLY]         = CMD_SIZE_ANY,
@@ -365,7 +365,7 @@ static const u8 kvaser_usb_leaf_cmd_sizes_usbcan[] = {
        [CMD_RX_STD_MESSAGE]            = kvaser_fsize(u.usbcan.rx_can),
        [CMD_RX_EXT_MESSAGE]            = kvaser_fsize(u.usbcan.rx_can),
        [CMD_CHIP_STATE_EVENT]          = kvaser_fsize(u.usbcan.chip_state_event),
-       [CMD_CAN_ERROR_EVENT]           = kvaser_fsize(u.usbcan.error_event),
+       [CMD_CAN_ERROR_EVENT]           = kvaser_fsize(u.usbcan.can_error_event),
        /* ignored events: */
        [CMD_USBCAN_CLOCK_OVERFLOW_EVENT] = CMD_SIZE_ANY,
 };
@@ -1137,11 +1137,11 @@ static void kvaser_usb_leaf_usbcan_rx_error(const struct kvaser_usb *dev,
 
        case CMD_CAN_ERROR_EVENT:
                es.channel = 0;
-               es.status = cmd->u.usbcan.error_event.status_ch0;
-               es.txerr = cmd->u.usbcan.error_event.tx_errors_count_ch0;
-               es.rxerr = cmd->u.usbcan.error_event.rx_errors_count_ch0;
+               es.status = cmd->u.usbcan.can_error_event.status_ch0;
+               es.txerr = cmd->u.usbcan.can_error_event.tx_errors_count_ch0;
+               es.rxerr = cmd->u.usbcan.can_error_event.rx_errors_count_ch0;
                es.usbcan.other_ch_status =
-                       cmd->u.usbcan.error_event.status_ch1;
+                       cmd->u.usbcan.can_error_event.status_ch1;
                kvaser_usb_leaf_usbcan_conditionally_rx_error(dev, &es);
 
                /* The USBCAN firmware supports up to 2 channels.
@@ -1149,13 +1149,13 @@ static void kvaser_usb_leaf_usbcan_rx_error(const struct kvaser_usb *dev,
                 */
                if (dev->nchannels == MAX_USBCAN_NET_DEVICES) {
                        es.channel = 1;
-                       es.status = cmd->u.usbcan.error_event.status_ch1;
+                       es.status = cmd->u.usbcan.can_error_event.status_ch1;
                        es.txerr =
-                               cmd->u.usbcan.error_event.tx_errors_count_ch1;
+                               cmd->u.usbcan.can_error_event.tx_errors_count_ch1;
                        es.rxerr =
-                               cmd->u.usbcan.error_event.rx_errors_count_ch1;
+                               cmd->u.usbcan.can_error_event.rx_errors_count_ch1;
                        es.usbcan.other_ch_status =
-                               cmd->u.usbcan.error_event.status_ch0;
+                               cmd->u.usbcan.can_error_event.status_ch0;
                        kvaser_usb_leaf_usbcan_conditionally_rx_error(dev, &es);
                }
                break;
@@ -1172,11 +1172,11 @@ static void kvaser_usb_leaf_leaf_rx_error(const struct kvaser_usb *dev,
 
        switch (cmd->id) {
        case CMD_CAN_ERROR_EVENT:
-               es.channel = cmd->u.leaf.error_event.channel;
-               es.status = cmd->u.leaf.error_event.status;
-               es.txerr = cmd->u.leaf.error_event.tx_errors_count;
-               es.rxerr = cmd->u.leaf.error_event.rx_errors_count;
-               es.leaf.error_factor = cmd->u.leaf.error_event.error_factor;
+               es.channel = cmd->u.leaf.can_error_event.channel;
+               es.status = cmd->u.leaf.can_error_event.status;
+               es.txerr = cmd->u.leaf.can_error_event.tx_errors_count;
+               es.rxerr = cmd->u.leaf.can_error_event.rx_errors_count;
+               es.leaf.error_factor = cmd->u.leaf.can_error_event.error_factor;
                break;
        case CMD_LEAF_LOG_MESSAGE:
                es.channel = cmd->u.leaf.log_message.channel;