Browse Source

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>
Jimmy Assarsson 7 years ago
parent
commit
1f6ed42c74
1 changed files with 3 additions and 11 deletions
  1. 3 11
      drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c

+ 3 - 11
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 {