* [PATCH v4 0/1] atm: solos-pci: Replace simple_strtol by kstrtoint
@ 2015-12-04 7:43 LABBE Corentin
2015-12-04 7:43 ` [PATCH v4 1/1] " LABBE Corentin
0 siblings, 1 reply; 3+ messages in thread
From: LABBE Corentin @ 2015-12-04 7:43 UTC (permalink / raw)
To: 3chas3, linux-atm-general; +Cc: LABBE Corentin, linux-kernel, netdev
Hello
Change since v3
- rework the test logic with ver/err
Change since v2
- Invert a test logic
Change since v1
- Always return error code from kstrtox.
LABBE Corentin (1):
atm: solos-pci: Replace simple_strtol by kstrtoint
drivers/atm/solos-pci.c | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
--
2.4.10
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v4 1/1] atm: solos-pci: Replace simple_strtol by kstrtoint
2015-12-04 7:43 [PATCH v4 0/1] atm: solos-pci: Replace simple_strtol by kstrtoint LABBE Corentin
@ 2015-12-04 7:43 ` LABBE Corentin
2015-12-05 22:51 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: LABBE Corentin @ 2015-12-04 7:43 UTC (permalink / raw)
To: 3chas3, linux-atm-general; +Cc: LABBE Corentin, linux-kernel, netdev
The simple_strtol function is obsolete.
This patch replace it by kstrtoint.
This will simplify code, since some error case not handled by
simple_strtol are handled by kstrtoint.
Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
---
drivers/atm/solos-pci.c | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 3d7fb65..0c2b4ba0 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -347,8 +347,8 @@ static char *next_string(struct sk_buff *skb)
*/
static int process_status(struct solos_card *card, int port, struct sk_buff *skb)
{
- char *str, *end, *state_str, *snr, *attn;
- int ver, rate_up, rate_down;
+ char *str, *state_str, *snr, *attn;
+ int ver, rate_up, rate_down, err;
if (!card->atmdev[port])
return -ENODEV;
@@ -357,7 +357,11 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
if (!str)
return -EIO;
- ver = simple_strtol(str, NULL, 10);
+ err = kstrtoint(str, 10, &ver);
+ if (err) {
+ dev_warn(&card->dev->dev, "Unexpected status interrupt version\n");
+ return err;
+ }
if (ver < 1) {
dev_warn(&card->dev->dev, "Unexpected status interrupt version %d\n",
ver);
@@ -373,16 +377,16 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
return 0;
}
- rate_down = simple_strtol(str, &end, 10);
- if (*end)
- return -EIO;
+ err = kstrtoint(str, 10, &rate_down);
+ if (err)
+ return err;
str = next_string(skb);
if (!str)
return -EIO;
- rate_up = simple_strtol(str, &end, 10);
- if (*end)
- return -EIO;
+ err = kstrtoint(str, 10, &rate_up);
+ if (err)
+ return err;
state_str = next_string(skb);
if (!state_str)
@@ -417,7 +421,7 @@ static int process_command(struct solos_card *card, int port, struct sk_buff *sk
struct solos_param *prm;
unsigned long flags;
int cmdpid;
- int found = 0;
+ int found = 0, err;
if (skb->len < 7)
return 0;
@@ -428,7 +432,9 @@ static int process_command(struct solos_card *card, int port, struct sk_buff *sk
skb->data[6] != '\n')
return 0;
- cmdpid = simple_strtol(&skb->data[1], NULL, 10);
+ err = kstrtoint(&skb->data[1], 10, &cmdpid);
+ if (err)
+ return err;
spin_lock_irqsave(&card->param_queue_lock, flags);
list_for_each_entry(prm, &card->param_queue, list) {
--
2.4.10
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v4 1/1] atm: solos-pci: Replace simple_strtol by kstrtoint
2015-12-04 7:43 ` [PATCH v4 1/1] " LABBE Corentin
@ 2015-12-05 22:51 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2015-12-05 22:51 UTC (permalink / raw)
To: clabbe.montjoie; +Cc: 3chas3, linux-atm-general, linux-kernel, netdev
From: LABBE Corentin <clabbe.montjoie@gmail.com>
Date: Fri, 4 Dec 2015 08:43:19 +0100
> The simple_strtol function is obsolete.
> This patch replace it by kstrtoint.
> This will simplify code, since some error case not handled by
> simple_strtol are handled by kstrtoint.
>
> Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Applied to net-next, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-12-05 22:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-04 7:43 [PATCH v4 0/1] atm: solos-pci: Replace simple_strtol by kstrtoint LABBE Corentin
2015-12-04 7:43 ` [PATCH v4 1/1] " LABBE Corentin
2015-12-05 22:51 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.