Return-Path: From: Ding Xiang To: marcel@holtmann.org, johan.hedberg@gmail.com, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2] Bluetooth: bt3c_cs: Fix obsolete function Date: Fri, 24 Aug 2018 06:44:25 -0400 Message-Id: <1535107465-5470-1-git-send-email-dingxiang@cmss.chinamobile.com> List-ID: simple_strtol and simple_strtoul are obsolete, both place use kstrtoul instead. V2: fix error tmp += tn Signed-off-by: Ding Xiang --- drivers/bluetooth/bt3c_cs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 25b0cf9..8f03774 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c @@ -449,7 +449,7 @@ static int bt3c_load_firmware(struct bt3c_info *info, char *ptr = (char *) firmware; char b[9]; unsigned int iobase, tmp; - unsigned long size, addr, fcs; + unsigned long size, addr, fcs, tn; int i, err = 0; iobase = info->p_dev->resource[0]->start; @@ -490,7 +490,9 @@ static int bt3c_load_firmware(struct bt3c_info *info, memset(b, 0, sizeof(b)); for (tmp = 0, i = 0; i < size; i++) { memcpy(b, ptr + (i * 2) + 2, 2); - tmp += simple_strtol(b, NULL, 16); + if (kstrtoul(b, 16, &tn)) + return -EINVAL; + tmp += tn; } if (((tmp + fcs) & 0xff) != 0xff) { @@ -505,7 +507,8 @@ static int bt3c_load_firmware(struct bt3c_info *info, memset(b, 0, sizeof(b)); for (i = 0; i < (size - 4) / 2; i++) { memcpy(b, ptr + (i * 4) + 12, 4); - tmp = simple_strtoul(b, NULL, 16); + if (kstrtoul(b, 16, &tmp)) + return -EINVAL; bt3c_put(iobase, tmp); } } -- 1.8.3.1