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

Commit b2dfa048 authored by Daniel Walter's avatar Daniel Walter Committed by Chris Metcalf
Browse files

replace strict_strto* call with kstrto* 



remove obsolete calls to strict_strto* and replace them
with kstrto* calls accordingly.

Signed-off-by: default avatarDaniel Walter <dwalter@google.com>
Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent ba159fd3

arch/tile/kernel/setup.c

+2 −5
Original line number Diff line number Diff line
@@ -228,13 +228,10 @@ early_param("isolnodes", setup_isolnodes); 
#if defined(CONFIG_PCI) && !defined(__tilegx__)

static int __init setup_pci_reserve(char* str)

{

	unsigned long mb;



	if (str == NULL || strict_strtoul(str, 0, &mb) != 0 ||

	    mb > 3 * 1024)

	if (str == NULL || kstrtouint(str, 0, &pci_reserve_mb) != 0 ||

	    pci_reserve_mb > 3 * 1024)

		return -EINVAL;



	pci_reserve_mb = mb;

	pr_info("Reserving %dMB for PCIE root complex mappings\n",

		pci_reserve_mb);

	return 0;

arch/tile/kernel/signal.c

+3 −4
Original line number Diff line number Diff line
@@ -321,14 +321,13 @@ int show_unhandled_signals = 1; 


static int __init crashinfo(char *str)

{

	unsigned long val;

	const char *word;



	if (*str == '\0')

		val = 2;

	else if (*str != '=' || strict_strtoul(++str, 0, &val) != 0)

		show_unhandled_signals = 2;

	else if (*str != '=' || kstrtoint(++str, 0, &show_unhandled_signals) != 0)

		return 0;

	show_unhandled_signals = val;



	switch (show_unhandled_signals) {

	case 0:

		word = "No";

arch/tile/kernel/traps.c

+2 −3
Original line number Diff line number Diff line
@@ -42,10 +42,9 @@ static int __init setup_unaligned_fixup(char *str) 
	 * will still parse the instruction, then fire a SIGBUS with

	 * the correct address from inside the single_step code.

	 */

	long val;

	if (strict_strtol(str, 0, &val) != 0)

	if (kstrtoint(str, 0, &unaligned_fixup) != 0)

		return 0;

	unaligned_fixup = val;



	pr_info("Fixups for unaligned data accesses are %s\n",

	       unaligned_fixup >= 0 ?

	       (unaligned_fixup ? "enabled" : "disabled") :

arch/tile/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ static long __write_once initfree = 1; 
static int __init set_initfree(char *str)

{

	long val;

	if (strict_strtol(str, 0, &val) == 0) {

	if (kstrtol(str, 0, &val) == 0) {

		initfree = val;

		pr_info("initfree: %s free init pages\n",

			initfree ? "will" : "won't");