2014-02-15 03:59:47

by Chase Southwood

Subject: [PATCH] Staging: comedi: kcomedilib: replace deprecated simple_strtoul() with kstrtouint()

Since simple_strtoul() has been deprecated, replace it with kstrtouint().
Also, since return code checking for this new function is enforced, add a
check to ensure that the conversion has succeeded.

Signed-off-by: Chase Southwood <[email protected]>
---
drivers/staging/comedi/kcomedilib/kcomedilib_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
index 7dc5a18..8923e65 100644
--- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
+++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
@@ -41,7 +41,8 @@ struct comedi_device *comedi_open(const char *filename)
if (strncmp(filename, "/dev/comedi", 11) != 0)
return NULL;

- minor = simple_strtoul(filename + 11, NULL, 0);
+ if (kstrtouint(filename + 11, 0, &minor))
+ return NULL;

if (minor >= COMEDI_NUM_BOARD_MINORS)
return NULL;
--
1.8.5.3

2014-02-17 13:10:23

by Ian Abbott

Subject: Re: [PATCH] Staging: comedi: kcomedilib: replace deprecated simple_strtoul() with kstrtouint()

On 2014-02-15 03:59, Chase Southwood wrote:
> Since simple_strtoul() has been deprecated, replace it with kstrtouint().
> Also, since return code checking for this new function is enforced, add a
> check to ensure that the conversion has succeeded.
>
> Signed-off-by: Chase Southwood <[email protected]>
> ---
> drivers/staging/comedi/kcomedilib/kcomedilib_main.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
> index 7dc5a18..8923e65 100644
> --- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
> +++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
> @@ -41,7 +41,8 @@ struct comedi_device *comedi_open(const char *filename)
> if (strncmp(filename, "/dev/comedi", 11) != 0)
> return NULL;
>
> - minor = simple_strtoul(filename + 11, NULL, 0);
> + if (kstrtouint(filename + 11, 0, &minor))
> + return NULL;
>
> if (minor >= COMEDI_NUM_BOARD_MINORS)
> return NULL;
>

Looks good!

Reviewed-by: Ian Abbott <[email protected]>

--
-=( Ian Abbott @ MEV Ltd. E-mail: <[email protected]> )=-
-=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-