diff options
| author | Jimmy Assarsson <jimmyassarsson@gmail.com> | 2018-02-16 14:41:06 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2018-07-27 10:40:19 +0200 |
| commit | 1f6ed42c742e8d1cfd3811ef7a134eaa75a511d6 (patch) | |
| tree | 29652da8819979785057433a5df8f0c621c807b4 /drivers/net/can/usb | |
| parent | can: kvaser_usb: Add support for Kvaser USB hydra family (diff) | |
| download | linux-1f6ed42c742e8d1cfd3811ef7a134eaa75a511d6.tar.xz linux-1f6ed42c742e8d1cfd3811ef7a134eaa75a511d6.zip | |
can: kvaser_usb: Simplify struct kvaser_cmd_cardinfo
serial_number_high can be removed from the struct since it is never used in
the USBcan II firmware.
Signed-off-by: Jimmy Assarsson <jimmyassarsson@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/usb')
| -rw-r--r-- | drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 14 |
1 files changed, 3 insertions, 11 deletions
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 70ffff724a26..07d2f3aa2c02 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -125,16 +125,8 @@ struct kvaser_cmd_simple { struct kvaser_cmd_cardinfo { u8 tid; u8 nchannels; - union { - struct { - __le32 serial_number; - __le32 padding; - } __packed leaf0; - struct { - __le32 serial_number_low; - __le32 serial_number_high; - } __packed usbcan0; - } __packed; + __le32 serial_number; + __le32 padding0; __le32 clock_resolution; __le32 mfgdate; u8 ean[8]; @@ -147,7 +139,7 @@ struct kvaser_cmd_cardinfo { u8 padding; } __packed usbcan1; } __packed; - __le16 padding; + __le16 padding1; } __packed; struct leaf_cmd_softinfo { |