diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2016-06-06 05:02:03 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2016-07-17 13:59:26 -0400 |
commit | 4360fa22ad5b48a1d1e10e31ffb383ed8c977435 (patch) | |
tree | cad6b4f9f9022fe39b74213ba11f51d5a9a228bb | |
parent | 858d68f10238fdd1ebdd0096f912f063e97c6766 (diff) |
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>
-rw-r--r-- | drivers/bluetooth/btwilink.c | 4 | ||||
-rw-r--r-- | drivers/media/radio/wl128x/fmdrv_common.c | 2 | ||||
-rw-r--r-- | drivers/misc/ti-st/st_core.c | 2 | ||||
-rw-r--r-- | drivers/nfc/nfcwilink.c | 4 | ||||
-rw-r--r-- | include/linux/ti_wilink_st.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c index 24a652f9252b..485281b3f167 100644 --- a/drivers/bluetooth/btwilink.c +++ b/drivers/bluetooth/btwilink.c | |||
@@ -51,7 +51,7 @@ | |||
51 | */ | 51 | */ |
52 | struct ti_st { | 52 | struct ti_st { |
53 | struct hci_dev *hdev; | 53 | struct hci_dev *hdev; |
54 | char reg_status; | 54 | int reg_status; |
55 | long (*st_write) (struct sk_buff *); | 55 | long (*st_write) (struct sk_buff *); |
56 | struct completion wait_reg_completion; | 56 | struct completion wait_reg_completion; |
57 | }; | 57 | }; |
@@ -83,7 +83,7 @@ static inline void ti_st_tx_complete(struct ti_st *hst, int pkt_type) | |||
83 | * status.ti_st_open() function will wait for signal from this | 83 | * status.ti_st_open() function will wait for signal from this |
84 | * API when st_register() function returns ST_PENDING. | 84 | * API when st_register() function returns ST_PENDING. |
85 | */ | 85 | */ |
86 | static void st_reg_completion_cb(void *priv_data, char data) | 86 | static void st_reg_completion_cb(void *priv_data, int data) |
87 | { | 87 | { |
88 | struct ti_st *lhst = priv_data; | 88 | struct ti_st *lhst = priv_data; |
89 | 89 | ||
diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c index 3f9e6df7d837..642b89c66bcb 100644 --- a/drivers/media/radio/wl128x/fmdrv_common.c +++ b/drivers/media/radio/wl128x/fmdrv_common.c | |||
@@ -1472,7 +1472,7 @@ static long fm_st_receive(void *arg, struct sk_buff *skb) | |||
1472 | * Called by ST layer to indicate protocol registration completion | 1472 | * Called by ST layer to indicate protocol registration completion |
1473 | * status. | 1473 | * status. |
1474 | */ | 1474 | */ |
1475 | static void fm_st_reg_comp_cb(void *arg, char data) | 1475 | static void fm_st_reg_comp_cb(void *arg, int data) |
1476 | { | 1476 | { |
1477 | struct fmdev *fmdev; | 1477 | struct fmdev *fmdev; |
1478 | 1478 | ||
diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c index dcdbd58672cc..00051590e00f 100644 --- a/drivers/misc/ti-st/st_core.c +++ b/drivers/misc/ti-st/st_core.c | |||
@@ -141,7 +141,7 @@ static void st_send_frame(unsigned char chnl_id, struct st_data_s *st_gdata) | |||
141 | * This function is being called with spin lock held, protocol drivers are | 141 | * This function is being called with spin lock held, protocol drivers are |
142 | * only expected to complete their waits and do nothing more than that. | 142 | * only expected to complete their waits and do nothing more than that. |
143 | */ | 143 | */ |
144 | static void st_reg_complete(struct st_data_s *st_gdata, char err) | 144 | static void st_reg_complete(struct st_data_s *st_gdata, int err) |
145 | { | 145 | { |
146 | unsigned char i = 0; | 146 | unsigned char i = 0; |
147 | pr_info(" %s ", __func__); | 147 | pr_info(" %s ", __func__); |
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 { | |||
94 | struct nci_dev *ndev; | 94 | struct nci_dev *ndev; |
95 | unsigned long flags; | 95 | unsigned long flags; |
96 | 96 | ||
97 | char st_register_cb_status; | 97 | int st_register_cb_status; |
98 | long (*st_write) (struct sk_buff *); | 98 | long (*st_write) (struct sk_buff *); |
99 | 99 | ||
100 | struct completion completed; | 100 | struct completion completed; |
@@ -320,7 +320,7 @@ exit: | |||
320 | } | 320 | } |
321 | 321 | ||
322 | /* Called by ST when registration is complete */ | 322 | /* Called by ST when registration is complete */ |
323 | static void nfcwilink_register_complete(void *priv_data, char data) | 323 | static void nfcwilink_register_complete(void *priv_data, int data) |
324 | { | 324 | { |
325 | struct nfcwilink *drv = priv_data; | 325 | struct nfcwilink *drv = priv_data; |
326 | 326 | ||
diff --git a/include/linux/ti_wilink_st.h b/include/linux/ti_wilink_st.h index 0a0d56834c8e..f2293028ab9d 100644 --- a/include/linux/ti_wilink_st.h +++ b/include/linux/ti_wilink_st.h | |||
@@ -71,7 +71,7 @@ struct st_proto_s { | |||
71 | enum proto_type type; | 71 | enum proto_type type; |
72 | long (*recv) (void *, struct sk_buff *); | 72 | long (*recv) (void *, struct sk_buff *); |
73 | unsigned char (*match_packet) (const unsigned char *data); | 73 | unsigned char (*match_packet) (const unsigned char *data); |
74 | void (*reg_complete_cb) (void *, char data); | 74 | void (*reg_complete_cb) (void *, int data); |
75 | long (*write) (struct sk_buff *skb); | 75 | long (*write) (struct sk_buff *skb); |
76 | void *priv_data; | 76 | void *priv_data; |
77 | 77 | ||