Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea2ab871 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files

stmmac: do not use strict_strtoul but kstrtoint 



This patch replaces the obsolete strict_strtoul with kstrtoint.

v2: also removed casting on kstrtoul.
v3: use kstrtoint instead of kstrtoul due to all vars are integer.
    thanks to E. Dumazet.

Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c801e3cc

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+10 −17
Original line number Diff line number Diff line
@@ -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

		}