mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
atm: solos-pci: Replace simple_strtol by kstrtoint
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> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
857e8a6765
commit
e94d91a6eb
1 changed files with 17 additions and 11 deletions
|
@ -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)
|
static int process_status(struct solos_card *card, int port, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
char *str, *end, *state_str, *snr, *attn;
|
char *str, *state_str, *snr, *attn;
|
||||||
int ver, rate_up, rate_down;
|
int ver, rate_up, rate_down, err;
|
||||||
|
|
||||||
if (!card->atmdev[port])
|
if (!card->atmdev[port])
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -357,7 +357,11 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
|
||||||
if (!str)
|
if (!str)
|
||||||
return -EIO;
|
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) {
|
if (ver < 1) {
|
||||||
dev_warn(&card->dev->dev, "Unexpected status interrupt version %d\n",
|
dev_warn(&card->dev->dev, "Unexpected status interrupt version %d\n",
|
||||||
ver);
|
ver);
|
||||||
|
@ -373,16 +377,16 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
rate_down = simple_strtol(str, &end, 10);
|
err = kstrtoint(str, 10, &rate_down);
|
||||||
if (*end)
|
if (err)
|
||||||
return -EIO;
|
return err;
|
||||||
|
|
||||||
str = next_string(skb);
|
str = next_string(skb);
|
||||||
if (!str)
|
if (!str)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
rate_up = simple_strtol(str, &end, 10);
|
err = kstrtoint(str, 10, &rate_up);
|
||||||
if (*end)
|
if (err)
|
||||||
return -EIO;
|
return err;
|
||||||
|
|
||||||
state_str = next_string(skb);
|
state_str = next_string(skb);
|
||||||
if (!state_str)
|
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;
|
struct solos_param *prm;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int cmdpid;
|
int cmdpid;
|
||||||
int found = 0;
|
int found = 0, err;
|
||||||
|
|
||||||
if (skb->len < 7)
|
if (skb->len < 7)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -428,7 +432,9 @@ static int process_command(struct solos_card *card, int port, struct sk_buff *sk
|
||||||
skb->data[6] != '\n')
|
skb->data[6] != '\n')
|
||||||
return 0;
|
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);
|
spin_lock_irqsave(&card->param_queue_lock, flags);
|
||||||
list_for_each_entry(prm, &card->param_queue, list) {
|
list_for_each_entry(prm, &card->param_queue, list) {
|
||||||
|
|
Loading…
Reference in a new issue