Commit 8ef426e1 authored by Frank Jungclaus's avatar Frank Jungclaus Committed by Marc Kleine-Budde

can: esd_usb: Prefix all structures with the device name

Prefix all the structures with the device name.
For commonly used structures make use of (the module name) esd_usb_.
For esd CAN-USB/2 and CAN-USB/Micro specific structures use
esd_usb_2_ and esd_usb_m.

Link: https://lore.kernel.org/all/CAMZ6RqLaDNy-fZ2G0+QMhUEckkXLL+ZyELVSDFmqpd++aBzZQg@mail.gmail.com/Suggested-by: default avatarVincent MAILHOL <mailhol.vincent@wanadoo.fr>
Signed-off-by: default avatarFrank Jungclaus <frank.jungclaus@esd.eu>
Link: https://lore.kernel.org/r/20230519195600.420644-5-frank.jungclaus@esd.euSigned-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 9dc3a695
...@@ -89,13 +89,13 @@ MODULE_LICENSE("GPL v2"); ...@@ -89,13 +89,13 @@ MODULE_LICENSE("GPL v2");
#define ESD_USB_MAX_RX_URBS 4 #define ESD_USB_MAX_RX_URBS 4
#define ESD_USB_MAX_TX_URBS 16 /* must be power of 2 */ #define ESD_USB_MAX_TX_URBS 16 /* must be power of 2 */
struct header_msg { struct esd_usb_header_msg {
u8 len; /* len is always the total message length in 32bit words */ u8 len; /* len is always the total message length in 32bit words */
u8 cmd; u8 cmd;
u8 rsvd[2]; u8 rsvd[2];
}; };
struct version_msg { struct esd_usb_version_msg {
u8 len; u8 len;
u8 cmd; u8 cmd;
u8 rsvd; u8 rsvd;
...@@ -103,7 +103,7 @@ struct version_msg { ...@@ -103,7 +103,7 @@ struct version_msg {
__le32 drv_version; __le32 drv_version;
}; };
struct version_reply_msg { struct esd_usb_version_reply_msg {
u8 len; u8 len;
u8 cmd; u8 cmd;
u8 nets; u8 nets;
...@@ -114,7 +114,7 @@ struct version_reply_msg { ...@@ -114,7 +114,7 @@ struct version_reply_msg {
__le32 ts; __le32 ts;
}; };
struct rx_msg { struct esd_usb_rx_msg {
u8 len; u8 len;
u8 cmd; u8 cmd;
u8 net; u8 net;
...@@ -132,7 +132,7 @@ struct rx_msg { ...@@ -132,7 +132,7 @@ struct rx_msg {
}; };
}; };
struct tx_msg { struct esd_usb_tx_msg {
u8 len; u8 len;
u8 cmd; u8 cmd;
u8 net; u8 net;
...@@ -142,7 +142,7 @@ struct tx_msg { ...@@ -142,7 +142,7 @@ struct tx_msg {
u8 data[CAN_MAX_DLEN]; u8 data[CAN_MAX_DLEN];
}; };
struct tx_done_msg { struct esd_usb_tx_done_msg {
u8 len; u8 len;
u8 cmd; u8 cmd;
u8 net; u8 net;
...@@ -151,7 +151,7 @@ struct tx_done_msg { ...@@ -151,7 +151,7 @@ struct tx_done_msg {
__le32 ts; __le32 ts;
}; };
struct id_filter_msg { struct esd_usb_id_filter_msg {
u8 len; u8 len;
u8 cmd; u8 cmd;
u8 net; u8 net;
...@@ -159,7 +159,7 @@ struct id_filter_msg { ...@@ -159,7 +159,7 @@ struct id_filter_msg {
__le32 mask[ESD_USB_MAX_ID_SEGMENT + 1]; __le32 mask[ESD_USB_MAX_ID_SEGMENT + 1];
}; };
struct set_baudrate_msg { struct esd_usb_set_baudrate_msg {
u8 len; u8 len;
u8 cmd; u8 cmd;
u8 net; u8 net;
...@@ -169,14 +169,14 @@ struct set_baudrate_msg { ...@@ -169,14 +169,14 @@ struct set_baudrate_msg {
/* Main message type used between library and application */ /* Main message type used between library and application */
union __packed esd_usb_msg { union __packed esd_usb_msg {
struct header_msg hdr; struct esd_usb_header_msg hdr;
struct version_msg version; struct esd_usb_version_msg version;
struct version_reply_msg version_reply; struct esd_usb_version_reply_msg version_reply;
struct rx_msg rx; struct esd_usb_rx_msg rx;
struct tx_msg tx; struct esd_usb_tx_msg tx;
struct tx_done_msg txdone; struct esd_usb_tx_done_msg txdone;
struct set_baudrate_msg setbaud; struct esd_usb_set_baudrate_msg setbaud;
struct id_filter_msg filter; struct esd_usb_id_filter_msg filter;
}; };
static struct usb_device_id esd_usb_table[] = { static struct usb_device_id esd_usb_table[] = {
...@@ -899,8 +899,8 @@ static const struct ethtool_ops esd_usb_ethtool_ops = { ...@@ -899,8 +899,8 @@ static const struct ethtool_ops esd_usb_ethtool_ops = {
.get_ts_info = ethtool_op_get_ts_info, .get_ts_info = ethtool_op_get_ts_info,
}; };
static const struct can_bittiming_const esd_usb2_bittiming_const = { static const struct can_bittiming_const esd_usb_2_bittiming_const = {
.name = "esd_usb2", .name = "esd_usb_2",
.tseg1_min = 1, .tseg1_min = 1,
.tseg1_max = 16, .tseg1_max = 16,
.tseg2_min = 1, .tseg2_min = 1,
...@@ -911,9 +911,9 @@ static const struct can_bittiming_const esd_usb2_bittiming_const = { ...@@ -911,9 +911,9 @@ static const struct can_bittiming_const esd_usb2_bittiming_const = {
.brp_inc = 1, .brp_inc = 1,
}; };
static int esd_usb2_set_bittiming(struct net_device *netdev) static int esd_usb_2_set_bittiming(struct net_device *netdev)
{ {
const struct can_bittiming_const *btc = &esd_usb2_bittiming_const; const struct can_bittiming_const *btc = &esd_usb_2_bittiming_const;
struct esd_usb_net_priv *priv = netdev_priv(netdev); struct esd_usb_net_priv *priv = netdev_priv(netdev);
struct can_bittiming *bt = &priv->can.bittiming; struct can_bittiming *bt = &priv->can.bittiming;
union esd_usb_msg *msg; union esd_usb_msg *msg;
...@@ -1026,8 +1026,8 @@ static int esd_usb_probe_one_net(struct usb_interface *intf, int index) ...@@ -1026,8 +1026,8 @@ static int esd_usb_probe_one_net(struct usb_interface *intf, int index)
priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES; priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
} }
priv->can.bittiming_const = &esd_usb2_bittiming_const; priv->can.bittiming_const = &esd_usb_2_bittiming_const;
priv->can.do_set_bittiming = esd_usb2_set_bittiming; priv->can.do_set_bittiming = esd_usb_2_set_bittiming;
priv->can.do_set_mode = esd_usb_set_mode; priv->can.do_set_mode = esd_usb_set_mode;
priv->can.do_get_berr_counter = esd_usb_get_berr_counter; priv->can.do_get_berr_counter = esd_usb_get_berr_counter;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment