From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752007AbdEJEjs (ORCPT ); Wed, 10 May 2017 00:39:48 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35277 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751796AbdEJEjr (ORCPT ); Wed, 10 May 2017 00:39:47 -0400 From: Guru Das Srinagesh To: groeck@chromium.org, linux@roeck-us.net, gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: typec: Fix sparse warnings about incorrect types Date: Tue, 9 May 2017 21:39:44 -0700 Message-Id: <1494391184-2607-1-git-send-email-gurooodas@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix the following sparse warnings about incorrect type usage: tcpci.c:290:38: warning: incorrect type in argument 1 (different base types) tcpci.c:290:38: expected unsigned short [unsigned] [usertype] header tcpci.c:290:38: got restricted __le16 const [usertype] header tcpci.c:295:16: warning: incorrect type in assignment (different base types) tcpci.c:295:16: expected unsigned int [unsigned] header tcpci.c:295:16: got restricted __le16 tcpci.c:393:28: warning: incorrect type in assignment (different base types) tcpci.c:393:28: expected restricted __le16 [usertype] header tcpci.c:393:28: got unsigned int [unsigned] [addressable] reg fusb302.c:1028:32: warning: incorrect type in argument 1 (different base types) fusb302.c:1028:32: expected unsigned short [unsigned] [usertype] header fusb302.c:1028:32: got restricted __le16 const [usertype] header fusb302.c:1484:32: warning: incorrect type in argument 1 (different base types) fusb302.c:1484:32: expected unsigned short [unsigned] [usertype] header fusb302.c:1484:32: got restricted __le16 [usertype] header Signed-off-by: Guru Das Srinagesh --- drivers/staging/typec/fusb302/fusb302.c | 4 ++-- drivers/staging/typec/tcpci.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/typec/fusb302/fusb302.c b/drivers/staging/typec/fusb302/fusb302.c index 2cee9a9..9612ef1 100644 --- a/drivers/staging/typec/fusb302/fusb302.c +++ b/drivers/staging/typec/fusb302/fusb302.c @@ -1025,7 +1025,7 @@ static int fusb302_pd_send_message(struct fusb302_chip *chip, buf[pos++] = FUSB302_TKN_SYNC1; buf[pos++] = FUSB302_TKN_SYNC2; - len = pd_header_cnt(msg->header) * 4; + len = pd_header_cnt(le16_to_cpu(msg->header)) * 4; /* plug 2 for header */ len += 2; if (len > 0x1F) { @@ -1481,7 +1481,7 @@ static int fusb302_pd_read_message(struct fusb302_chip *chip, (u8 *)&msg->header); if (ret < 0) return ret; - len = pd_header_cnt(msg->header) * 4; + len = pd_header_cnt(le16_to_cpu(msg->header)) * 4; /* add 4 to length to include the CRC */ if (len > PD_MAX_PAYLOAD * 4) { fusb302_log(chip, "PD message too long %d", len); diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c index 5e5be74..d0c22a7 100644 --- a/drivers/staging/typec/tcpci.c +++ b/drivers/staging/typec/tcpci.c @@ -287,12 +287,12 @@ static int tcpci_pd_transmit(struct tcpc_dev *tcpc, unsigned int reg, cnt, header; int ret; - cnt = msg ? pd_header_cnt(msg->header) * 4 : 0; + cnt = msg ? pd_header_cnt(le16_to_cpu(msg->header)) * 4 : 0; ret = regmap_write(tcpci->regmap, TCPC_TX_BYTE_CNT, cnt + 2); if (ret < 0) return ret; - header = msg ? msg->header : 0; + header = msg ? le16_to_cpu(msg->header) : 0; ret = tcpci_write16(tcpci, TCPC_TX_HDR, header); if (ret < 0) return ret; @@ -390,7 +390,7 @@ static irqreturn_t tcpci_irq(int irq, void *dev_id) regmap_read(tcpci->regmap, TCPC_RX_BYTE_CNT, &cnt); tcpci_read16(tcpci, TCPC_RX_HDR, ®); - msg.header = reg; + msg.header = cpu_to_le16(reg); if (WARN_ON(cnt > sizeof(msg.payload))) cnt = sizeof(msg.payload); -- 2.7.4