summaryrefslogtreecommitdiff
path: root/drivers/nfc/nfcwilink.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2016-06-06 11:02:03 +0200
committerMarcel Holtmann <marcel@holtmann.org>2016-07-17 19:59:26 +0200
commit4360fa22ad5b48a1d1e10e31ffb383ed8c977435 (patch)
treecad6b4f9f9022fe39b74213ba11f51d5a9a228bb /drivers/nfc/nfcwilink.c
parent858d68f10238fdd1ebdd0096f912f063e97c6766 (diff)
downloadlwn-4360fa22ad5b48a1d1e10e31ffb383ed8c977435.tar.gz
lwn-4360fa22ad5b48a1d1e10e31ffb383ed8c977435.zip
drivers: misc: ti-st: Use int instead of fuzzy char for callback status
On mips and parisc: drivers/bluetooth/btwilink.c: In function 'ti_st_open': drivers/bluetooth/btwilink.c:174:21: warning: overflow in implicit constant conversion [-Woverflow] hst->reg_status = -EINPROGRESS; drivers/nfc/nfcwilink.c: In function 'nfcwilink_open': drivers/nfc/nfcwilink.c:396:31: warning: overflow in implicit constant conversion [-Woverflow] drv->st_register_cb_status = -EINPROGRESS; There are actually two issues: 1. Whether "char" is signed or unsigned depends on the architecture. As the completion callback data is used to pass a (negative) error code, it should always be signed. 2. EINPROGRESS is 150 on mips, 245 on parisc. Hence -EINPROGRESS doesn't fit in a signed 8-bit number. Change the callback status from "char" to "int" to fix these. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/nfc/nfcwilink.c')
-rw-r--r--drivers/nfc/nfcwilink.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index f81e500e7650..3fbd18b8e473 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -94,7 +94,7 @@ struct nfcwilink {
struct nci_dev *ndev;
unsigned long flags;
- char st_register_cb_status;
+ int st_register_cb_status;
long (*st_write) (struct sk_buff *);
struct completion completed;
@@ -320,7 +320,7 @@ exit:
}
/* Called by ST when registration is complete */
-static void nfcwilink_register_complete(void *priv_data, char data)
+static void nfcwilink_register_complete(void *priv_data, int data)
{
struct nfcwilink *drv = priv_data;