Skip to content

Commit

Permalink
replace strict_strto* call with kstrto*
Browse files Browse the repository at this point in the history
remove obsolete calls to strict_strto* and replace them
with kstrto* calls accordingly.

Signed-off-by: Daniel Walter <dwalter@google.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
  • Loading branch information
Daniel Walter authored and Chris Metcalf committed May 28, 2014
1 parent ba159fd commit b2dfa04
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
7 changes: 2 additions & 5 deletions arch/tile/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions arch/tile/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
5 changes: 2 additions & 3 deletions arch/tile/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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") :
Expand Down
2 changes: 1 addition & 1 deletion arch/tile/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit b2dfa04

Please sign in to comment.