From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jimmy Assarsson Subject: [PATCH v3 1/2] can: kvaser_usb: Simplify struct kvaser_msg_cardinfo Date: Fri, 16 Feb 2018 14:21:24 +0100 Message-ID: <20180216132125.13232-1-jimmyassarsson@gmail.com> Return-path: Received: from mail-lf0-f67.google.com ([209.85.215.67]:33255 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030766AbeBPNVu (ORCPT ); Fri, 16 Feb 2018 08:21:50 -0500 Received: by mail-lf0-f67.google.com with SMTP id j193so4051047lfe.0 for ; Fri, 16 Feb 2018 05:21:49 -0800 (PST) Sender: linux-can-owner@vger.kernel.org List-ID: To: linux-can@vger.kernel.org Cc: Jimmy Assarsson serial_number_high can be removed from the struct since it is never used in the USBcan II firmware. Signed-off-by: Jimmy Assarsson --- Changes in v3: - Change data type of ean, from u32 to __le32. Changes in v2: - Made this a separate patch. drivers/net/can/usb/kvaser_usb.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c index 63587b8e6825..3c17bb3b1588 100644 --- a/drivers/net/can/usb/kvaser_usb.c +++ b/drivers/net/can/usb/kvaser_usb.c @@ -196,19 +196,11 @@ struct kvaser_msg_simple { struct kvaser_msg_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]; + __le32 ean[2]; u8 hw_revision; union { struct { @@ -218,7 +210,7 @@ struct kvaser_msg_cardinfo { u8 padding; } __packed usbcan1; } __packed; - __le16 padding; + __le16 padding1; } __packed; struct kvaser_msg_cardinfo2 { -- 2.16.1