diff options
author | Ding Xiang <dingxiang@cmss.chinamobile.com> | 2018-08-26 22:55:00 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2018-09-27 06:57:39 -0400 |
commit | 385613506aef4d21448f8f167513f46a008a3b0c (patch) | |
tree | df42a9e56f40911e9ed1e5776050638069067c4f | |
parent | 7cbfd1e2aad410d96fa6162aeb3f9cff1fecfc58 (diff) |
Bluetooth: bt3c_cs: Fix obsolete function
simple_strtol and simple_strtoul are obsolete, both place
use kstrtouint instead.
V2: fix error tmp += tn
V3: fix compile error
Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 25b0cf952b91..54713833951a 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -448,7 +448,7 @@ static int bt3c_load_firmware(struct bt3c_info *info, | |||
448 | { | 448 | { |
449 | char *ptr = (char *) firmware; | 449 | char *ptr = (char *) firmware; |
450 | char b[9]; | 450 | char b[9]; |
451 | unsigned int iobase, tmp; | 451 | unsigned int iobase, tmp, tn; |
452 | unsigned long size, addr, fcs; | 452 | unsigned long size, addr, fcs; |
453 | int i, err = 0; | 453 | int i, err = 0; |
454 | 454 | ||
@@ -490,7 +490,9 @@ static int bt3c_load_firmware(struct bt3c_info *info, | |||
490 | memset(b, 0, sizeof(b)); | 490 | memset(b, 0, sizeof(b)); |
491 | for (tmp = 0, i = 0; i < size; i++) { | 491 | for (tmp = 0, i = 0; i < size; i++) { |
492 | memcpy(b, ptr + (i * 2) + 2, 2); | 492 | memcpy(b, ptr + (i * 2) + 2, 2); |
493 | tmp += simple_strtol(b, NULL, 16); | 493 | if (kstrtouint(b, 16, &tn)) |
494 | return -EINVAL; | ||
495 | tmp += tn; | ||
494 | } | 496 | } |
495 | 497 | ||
496 | if (((tmp + fcs) & 0xff) != 0xff) { | 498 | if (((tmp + fcs) & 0xff) != 0xff) { |
@@ -505,7 +507,8 @@ static int bt3c_load_firmware(struct bt3c_info *info, | |||
505 | memset(b, 0, sizeof(b)); | 507 | memset(b, 0, sizeof(b)); |
506 | for (i = 0; i < (size - 4) / 2; i++) { | 508 | for (i = 0; i < (size - 4) / 2; i++) { |
507 | memcpy(b, ptr + (i * 4) + 12, 4); | 509 | memcpy(b, ptr + (i * 4) + 12, 4); |
508 | tmp = simple_strtoul(b, NULL, 16); | 510 | if (kstrtouint(b, 16, &tmp)) |
511 | return -EINVAL; | ||
509 | bt3c_put(iobase, tmp); | 512 | bt3c_put(iobase, tmp); |
510 | } | 513 | } |
511 | } | 514 | } |