|
@@ -2129,42 +2129,35 @@ static int __init stmmac_cmdline_opt(char *str)
|
|
|
return -EINVAL;
|
|
|
while ((opt = strsep(&str, ",")) != NULL) {
|
|
|
if (!strncmp(opt, "debug:", 6)) {
|
|
|
- if (strict_strtoul(opt + 6, 0, (unsigned long *)&debug))
|
|
|
+ if (kstrtoint(opt + 6, 0, &debug))
|
|
|
goto err;
|
|
|
} else if (!strncmp(opt, "phyaddr:", 8)) {
|
|
|
- if (strict_strtoul(opt + 8, 0,
|
|
|
- (unsigned long *)&phyaddr))
|
|
|
+ if (kstrtoint(opt + 8, 0, &phyaddr))
|
|
|
goto err;
|
|
|
} else if (!strncmp(opt, "dma_txsize:", 11)) {
|
|
|
- if (strict_strtoul(opt + 11, 0,
|
|
|
- (unsigned long *)&dma_txsize))
|
|
|
+ if (kstrtoint(opt + 11, 0, &dma_txsize))
|
|
|
goto err;
|
|
|
} else if (!strncmp(opt, "dma_rxsize:", 11)) {
|
|
|
- if (strict_strtoul(opt + 11, 0,
|
|
|
- (unsigned long *)&dma_rxsize))
|
|
|
+ if (kstrtoint(opt + 11, 0, &dma_rxsize))
|
|
|
goto err;
|
|
|
} else if (!strncmp(opt, "buf_sz:", 7)) {
|
|
|
- if (strict_strtoul(opt + 7, 0,
|
|
|
- (unsigned long *)&buf_sz))
|
|
|
+ if (kstrtoint(opt + 7, 0, &buf_sz))
|
|
|
goto err;
|
|
|
} else if (!strncmp(opt, "tc:", 3)) {
|
|
|
- if (strict_strtoul(opt + 3, 0, (unsigned long *)&tc))
|
|
|
+ if (kstrtoint(opt + 3, 0, &tc))
|
|
|
goto err;
|
|
|
} else if (!strncmp(opt, "watchdog:", 9)) {
|
|
|
- if (strict_strtoul(opt + 9, 0,
|
|
|
- (unsigned long *)&watchdog))
|
|
|
+ if (kstrtoint(opt + 9, 0, &watchdog))
|
|
|
goto err;
|
|
|
} else if (!strncmp(opt, "flow_ctrl:", 10)) {
|
|
|
- if (strict_strtoul(opt + 10, 0,
|
|
|
- (unsigned long *)&flow_ctrl))
|
|
|
+ if (kstrtoint(opt + 10, 0, &flow_ctrl))
|
|
|
goto err;
|
|
|
} else if (!strncmp(opt, "pause:", 6)) {
|
|
|
- if (strict_strtoul(opt + 6, 0, (unsigned long *)&pause))
|
|
|
+ if (kstrtoint(opt + 6, 0, &pause))
|
|
|
goto err;
|
|
|
#ifdef CONFIG_STMMAC_TIMER
|
|
|
} else if (!strncmp(opt, "tmrate:", 7)) {
|
|
|
- if (strict_strtoul(opt + 7, 0,
|
|
|
- (unsigned long *)&tmrate))
|
|
|
+ if (kstrtoint(opt + 7, 0, &tmrate))
|
|
|
goto err;
|
|
|
#endif
|
|
|
}
|