From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752147AbdCCTAR (ORCPT ); Fri, 3 Mar 2017 14:00:17 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33799 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751641AbdCCTAO (ORCPT ); Fri, 3 Mar 2017 14:00:14 -0500 From: Adrien Descamps To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Adrien Descamps Subject: [PATCH 1/2] Staging: wlan-ng: Fix sparse warnings by using appropriate endian types Date: Fri, 3 Mar 2017 19:58:30 +0100 Message-Id: <1488567511-3284-1-git-send-email-adrien.descamps@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <20170303112621.GC4132@mwanda> References: <20170303112621.GC4132@mwanda> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix some sparse warning by using correct endian types in structs and local variables. This patch only fix sparse warnings and do not change the logic. Signed-off-by: Adrien Descamps --- Compile tested only drivers/staging/wlan-ng/hfa384x.h | 58 +++++++++++++++++------------------ drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- drivers/staging/wlan-ng/p80211conv.h | 28 ++++++++--------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index 60caf9c..7bcc0db 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h @@ -482,7 +482,7 @@ struct hfa384x_tx_frame { u8 address3[6]; u16 sequence_control; u8 address4[6]; - u16 data_len; /* little endian format */ + __le16 data_len; /* little endian format */ /*-- 802.3 Header Information --*/ @@ -801,41 +801,41 @@ struct hfa384x_usb_txfrm { } __packed; struct hfa384x_usb_cmdreq { - u16 type; - u16 cmd; - u16 parm0; - u16 parm1; - u16 parm2; + __le16 type; + __le16 cmd; + __le16 parm0; + __le16 parm1; + __le16 parm2; u8 pad[54]; } __packed; struct hfa384x_usb_wridreq { - u16 type; - u16 frmlen; - u16 rid; + __le16 type; + __le16 frmlen; + __le16 rid; u8 data[HFA384x_RIDDATA_MAXLEN]; } __packed; struct hfa384x_usb_rridreq { - u16 type; - u16 frmlen; - u16 rid; + __le16 type; + __le16 frmlen; + __le16 rid; u8 pad[58]; } __packed; struct hfa384x_usb_wmemreq { - u16 type; - u16 frmlen; - u16 offset; - u16 page; + __le16 type; + __le16 frmlen; + __le16 offset; + __le16 page; u8 data[HFA384x_USB_RWMEM_MAXLEN]; } __packed; struct hfa384x_usb_rmemreq { - u16 type; - u16 frmlen; - u16 offset; - u16 page; + __le16 type; + __le16 frmlen; + __le16 offset; + __le16 page; u8 pad[56]; } __packed; @@ -854,16 +854,16 @@ struct hfa384x_usb_infofrm { struct hfa384x_usb_statusresp { u16 type; - u16 status; - u16 resp0; - u16 resp1; - u16 resp2; + __le16 status; + __le16 resp0; + __le16 resp1; + __le16 resp2; } __packed; struct hfa384x_usb_rridresp { u16 type; - u16 frmlen; - u16 rid; + __le16 frmlen; + __le16 rid; u8 data[HFA384x_RIDDATA_MAXLEN]; } __packed; @@ -1388,13 +1388,13 @@ static inline int hfa384x_drvr_getconfig16(struct hfa384x *hw, u16 rid, void *va result = hfa384x_drvr_getconfig(hw, rid, val, sizeof(u16)); if (result == 0) - *((u16 *)val) = le16_to_cpu(*((u16 *)val)); + *((u16 *)val) = le16_to_cpu(*((__le16 *)val)); return result; } static inline int hfa384x_drvr_setconfig16(struct hfa384x *hw, u16 rid, u16 val) { - u16 value = cpu_to_le16(val); + __le16 value = cpu_to_le16(val); return hfa384x_drvr_setconfig(hw, rid, &value, sizeof(value)); } @@ -1408,7 +1408,7 @@ hfa384x_drvr_setconfig_async(struct hfa384x *hw, static inline int hfa384x_drvr_setconfig16_async(struct hfa384x *hw, u16 rid, u16 val) { - u16 value = cpu_to_le16(val); + __le16 value = cpu_to_le16(val); return hfa384x_drvr_setconfig_async(hw, rid, &value, sizeof(value), NULL, NULL); diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 4fe037a..f26cc19 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c @@ -2316,7 +2316,7 @@ int hfa384x_drvr_ramdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len) int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len) { int result = 0; - u16 *pda = buf; + __le16 *pda = buf; int pdaok = 0; int morepdrs = 1; int currpdr = 0; /* word offset of the current pdr */ diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h index ed70d98..bd66826 100644 --- a/drivers/staging/wlan-ng/p80211conv.h +++ b/drivers/staging/wlan-ng/p80211conv.h @@ -101,20 +101,20 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb); * Frame capture header. (See doc/capturefrm.txt) */ struct p80211_caphdr { - u32 version; - u32 length; - u64 mactime; - u64 hosttime; - u32 phytype; - u32 channel; - u32 datarate; - u32 antenna; - u32 priority; - u32 ssi_type; - s32 ssi_signal; - s32 ssi_noise; - u32 preamble; - u32 encoding; + __be32 version; + __be32 length; + __be64 mactime; + __be64 hosttime; + __be32 phytype; + __be32 channel; + __be32 datarate; + __be32 antenna; + __be32 priority; + __be32 ssi_type; + __be32 ssi_signal; + __be32 ssi_noise; + __be32 preamble; + __be32 encoding; }; /* buffer free method pointer type */ -- 2.1.4