Skip to content

Commit 9efb85c

Browse files
Hariprasad Kelamrostedt
authored andcommitted
ftrace: Fix warning using plain integer as NULL & spelling corrections
Changed 0 --> NULL to avoid sparse warning Corrected spelling mistakes reported by checkpatch.pl Sparse warning below: sudo make C=2 CF=-D__CHECK_ENDIAN__ M=kernel/trace CHECK kernel/trace/ftrace.c kernel/trace/ftrace.c:3007:24: warning: Using plain integer as NULL pointer kernel/trace/ftrace.c:4758:37: warning: Using plain integer as NULL pointer Link: http://lkml.kernel.org/r/20190323183523.GA2244@hari-Inspiron-1545 Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
1 parent 3dee10d commit 9efb85c

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

kernel/trace/ftrace.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,7 @@ static void print_bug_type(void)
19921992
* modifying the code. @failed should be one of either:
19931993
* EFAULT - if the problem happens on reading the @ip address
19941994
* EINVAL - if what is read at @ip is not what was expected
1995-
* EPERM - if the problem happens on writting to the @ip address
1995+
* EPERM - if the problem happens on writing to the @ip address
19961996
*/
19971997
void ftrace_bug(int failed, struct dyn_ftrace *rec)
19981998
{
@@ -2391,7 +2391,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable)
23912391
return ftrace_modify_call(rec, ftrace_old_addr, ftrace_addr);
23922392
}
23932393

2394-
return -1; /* unknow ftrace bug */
2394+
return -1; /* unknown ftrace bug */
23952395
}
23962396

23972397
void __weak ftrace_replace_code(int mod_flags)
@@ -3004,7 +3004,7 @@ ftrace_allocate_pages(unsigned long num_to_init)
30043004
int cnt;
30053005

30063006
if (!num_to_init)
3007-
return 0;
3007+
return NULL;
30083008

30093009
start_pg = pg = kzalloc(sizeof(*pg), GFP_KERNEL);
30103010
if (!pg)
@@ -4755,7 +4755,7 @@ static int
47554755
ftrace_set_addr(struct ftrace_ops *ops, unsigned long ip, int remove,
47564756
int reset, int enable)
47574757
{
4758-
return ftrace_set_hash(ops, 0, 0, ip, remove, reset, enable);
4758+
return ftrace_set_hash(ops, NULL, 0, ip, remove, reset, enable);
47594759
}
47604760

47614761
/**
@@ -5463,7 +5463,7 @@ void ftrace_create_filter_files(struct ftrace_ops *ops,
54635463

54645464
/*
54655465
* The name "destroy_filter_files" is really a misnomer. Although
5466-
* in the future, it may actualy delete the files, but this is
5466+
* in the future, it may actually delete the files, but this is
54675467
* really intended to make sure the ops passed in are disabled
54685468
* and that when this function returns, the caller is free to
54695469
* free the ops.
@@ -5786,7 +5786,7 @@ void ftrace_module_enable(struct module *mod)
57865786
/*
57875787
* If the tracing is enabled, go ahead and enable the record.
57885788
*
5789-
* The reason not to enable the record immediatelly is the
5789+
* The reason not to enable the record immediately is the
57905790
* inherent check of ftrace_make_nop/ftrace_make_call for
57915791
* correct previous instructions. Making first the NOP
57925792
* conversion puts the module to the correct state, thus

0 commit comments

Comments
 (0)