[PATCH] staging/ks7010: Fix type assignment for struct hostif_hdr

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Cezary Gapinski <gapalinux@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH] staging/ks7010: Fix type assignment for struct hostif_hdr
Date	Sat, 29 Apr 2017 20:00:02 +0200
Message-ID	<tBEP0-N8-3@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Ai1/5ELVkXxYIl0QC+jHq1SDm+4C1rBh+MW9VvzAaLg=; b=ljjxPuiiei5cy0ZTmXtAqzhxUs+x+o0nYc2gVLVr4QUjWyIuqFt84jqVZB3K3w67zM zpIEfEqWot2YA2Jz3ue9Q1YKM8sqtW852u/rtwNHzaN22LHQl8D1+AfbpMnxwjpTQoIx 8lyz7u3B+7nDdQn9yXiaHKjMwEvemapcSdgfaSb+mKyXX0nyeExNJWu0v1NvCgrYyTh+ TPE/luNZvNzbW+2jnAxVoD/S1jqMQ5b5H18EmSu61sQRU1UwXIxHaDHio3sLcyP1mhk9 nbW8OmLTFTzV0IkquKdluDCCYkREj2uKIF4TcLhEjC0jPTkB7MbXGi1Ld9hNssIUTnzm syCQ==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Ai1/5ELVkXxYIl0QC+jHq1SDm+4C1rBh+MW9VvzAaLg=; b=EW2p06Ovzpws2dMbUr9R9UWayRQ1h1Opd++jbD1MUp975ghXanL7x2qdi0xM+4b4Xl eFNYduoHBPsv49FxPinQsRkGDmkupE0WTFF4sFUwkxIyE8ClyosoeUeJdz/rbcwN9Q1W xSebwMU3qkZmPVE3n06LtD72K+CBejlLDn1FbvZEnu+ojFk/4ai32I9JZNsM9g/OSC1w k/2/RfK7jTASLNkTe9m1i/Y9kLwExg+pd0mgN/mXvaV9iwVkMYNn+TmohPmDQnuDY91l jdmWYQCv35g4VgvbB1ieMd9R8Dv2m55znQRwoGV2wjSDB1bSQlmPqdsoP45XBS76zir4 hhIQ==
X-Gm-Message-State	AN3rC/4E4WkLj7OENCrTm6OXjXzjLw/UrCjzFUkWo4QgspqRPOCA/WZq O/Li6mvWPKq+XQ==
X-Received	by 10.46.81.2 with SMTP id f2mr6444572ljb.119.1493488482858; Sat, 29 Apr 2017 10:54:42 -0700 (PDT)
X-Mailer	git-send-email 2.7.4
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	67
Organization	linux.* mail to news gateway
X-Original-Cc	me@tobin.cc, wsa@the-dreams.de, karniksayli1995@gmail.com, shiva@exdev.nl, bhumirks@gmail.com, mattkilgore12@gmail.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
X-Original-Date	Sat, 29 Apr 2017 19:54:30 +0200
X-Original-Message-ID	<1493488470-13487-1-git-send-email-gapalinux@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1633315

Show key headers only | View raw

Sparse spits out a warnings about __le16 and unsigned short assignment.
Change the type of size and event members of struct hostif_hdr
to __le16 and correct conversion to the proper cpu type.

Signed-off-by: Cezary Gapinski <gapalinux@gmail.com>
---
 drivers/staging/ks7010/ks7010_sdio.c | 10 ++++++----
 drivers/staging/ks7010/ks_hostif.h   |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c
index ec11799..e3a134d 100644
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ b/drivers/staging/ks7010/ks7010_sdio.c
@@ -269,7 +269,8 @@ static int write_to_device(struct ks_wlan_private *priv, unsigned char *buffer,
 	hdr = (struct hostif_hdr *)buffer;
 
 	DPRINTK(4, "size=%d\n", hdr->size);
-	if (hdr->event < HIF_DATA_REQ || HIF_REQ_MAX < hdr->event) {
+	if (le16_to_cpu(hdr->event) < HIF_DATA_REQ ||
+	    le16_to_cpu(hdr->event) > HIF_REQ_MAX) {
 		DPRINTK(1, "unknown event=%04X\n", hdr->event);
 		return 0;
 	}
@@ -327,13 +328,14 @@ int ks_wlan_hw_tx(struct ks_wlan_private *priv, void *p, unsigned long size,
 
 	hdr = (struct hostif_hdr *)p;
 
-	if (hdr->event < HIF_DATA_REQ || HIF_REQ_MAX < hdr->event) {
+	if (le16_to_cpu(hdr->event) < HIF_DATA_REQ ||
+	    le16_to_cpu(hdr->event) > HIF_REQ_MAX) {
 		DPRINTK(1, "unknown event=%04X\n", hdr->event);
 		return 0;
 	}
 
 	/* add event to hostt buffer */
-	priv->hostt.buff[priv->hostt.qtail] = hdr->event;
+	priv->hostt.buff[priv->hostt.qtail] = le16_to_cpu(hdr->event);
 	priv->hostt.qtail = (priv->hostt.qtail + 1) % SME_EVENT_BUFF_SIZE;
 
 	DPRINTK(4, "event=%04X\n", hdr->event);
@@ -403,7 +405,7 @@ static void ks_wlan_hw_rx(struct ks_wlan_private *priv, uint16_t size)
 
 	hdr = (struct hostif_hdr *)&rx_buffer->data[0];
 	rx_buffer->size = le16_to_cpu(hdr->size) + sizeof(hdr->size);
-	event = hdr->event;
+	event = le16_to_cpu(hdr->event);
 	inc_rxqtail(priv);
 
 	ret = ks7010_sdio_writeb(priv, READ_STATUS, REG_STATUS_IDLE);
diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h
index d773432..7e4d1aa 100644
--- a/drivers/staging/ks7010/ks_hostif.h
+++ b/drivers/staging/ks7010/ks_hostif.h
@@ -62,8 +62,8 @@
  */
 
 struct hostif_hdr {
-	u16 size;
-	u16 event;
+	__le16 size;
+	__le16 event;
 } __packed;
 
 struct hostif_data_request_t {
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] staging/ks7010: Fix type assignment for struct hostif_hdr Cezary Gapinski <gapalinux@gmail.com> - 2017-04-29 20:00 +0200
  Re: [PATCH] staging/ks7010: Fix type assignment for struct hostif_hdr "Tobin C. Harding" <me@tobin.cc> - 2017-04-30 10:10 +0200
  Re: [PATCH] staging/ks7010: Fix type assignment for struct hostif_hdr "Tobin C. Harding" <me@tobin.cc> - 2017-05-01 12:10 +0200
    Re: [PATCH] staging/ks7010: Fix type assignment for struct  hostif_hdr gapalinux <gapalinux@gmail.com> - 2017-05-01 16:20 +0200
      Re: [PATCH] staging/ks7010: Fix type assignment for struct hostif_hdr "Tobin C. Harding" <me@tobin.cc> - 2017-05-01 23:40 +0200

csiph-web