kernel:module Fix coding style errors and warnings.
Fixed codin style errors and warnings. Changes printk with print_debug/warn. Changed seq_printf to seq_puts. Signed-off-by: Ionut Alexa <ionut.m.alexa@gmail.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (removed bogus KERN_DEFAULT conversion)
This commit is contained in:
parent
e513cc1c07
commit
6da0b56515
1 changed files with 28 additions and 25 deletions
|
@ -858,8 +858,10 @@ static inline void print_unload_info(struct seq_file *m, struct module *mod)
|
|||
|
||||
seq_printf(m, " %lu ", module_refcount(mod));
|
||||
|
||||
/* Always include a trailing , so userspace can differentiate
|
||||
between this and the old multi-field proc format. */
|
||||
/*
|
||||
* Always include a trailing , so userspace can differentiate
|
||||
* between this and the old multi-field proc format.
|
||||
*/
|
||||
list_for_each_entry(use, &mod->source_list, source_list) {
|
||||
printed_something = 1;
|
||||
seq_printf(m, "%s,", use->source->name);
|
||||
|
@ -867,11 +869,11 @@ static inline void print_unload_info(struct seq_file *m, struct module *mod)
|
|||
|
||||
if (mod->init != NULL && mod->exit == NULL) {
|
||||
printed_something = 1;
|
||||
seq_printf(m, "[permanent],");
|
||||
seq_puts(m, "[permanent],");
|
||||
}
|
||||
|
||||
if (!printed_something)
|
||||
seq_printf(m, "-");
|
||||
seq_puts(m, "-");
|
||||
}
|
||||
|
||||
void __symbol_put(const char *symbol)
|
||||
|
@ -960,7 +962,7 @@ EXPORT_SYMBOL(module_put);
|
|||
static inline void print_unload_info(struct seq_file *m, struct module *mod)
|
||||
{
|
||||
/* We don't know the usage count, or what modules are using. */
|
||||
seq_printf(m, " - -");
|
||||
seq_puts(m, " - -");
|
||||
}
|
||||
|
||||
static inline void module_unload_free(struct module *mod)
|
||||
|
@ -1147,7 +1149,7 @@ static int check_version(Elf_Shdr *sechdrs,
|
|||
return 0;
|
||||
|
||||
bad_version:
|
||||
printk("%s: disagrees about version of symbol %s\n",
|
||||
pr_warn("%s: disagrees about version of symbol %s\n",
|
||||
mod->name, symname);
|
||||
return 0;
|
||||
}
|
||||
|
@ -1270,15 +1272,13 @@ static inline bool sect_empty(const Elf_Shdr *sect)
|
|||
return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
|
||||
}
|
||||
|
||||
struct module_sect_attr
|
||||
{
|
||||
struct module_sect_attr {
|
||||
struct module_attribute mattr;
|
||||
char *name;
|
||||
unsigned long address;
|
||||
};
|
||||
|
||||
struct module_sect_attrs
|
||||
{
|
||||
struct module_sect_attrs {
|
||||
struct attribute_group grp;
|
||||
unsigned int nsections;
|
||||
struct module_sect_attr attrs[0];
|
||||
|
@ -1532,7 +1532,8 @@ static int module_add_modinfo_attrs(struct module *mod)
|
|||
(attr->test && attr->test(mod))) {
|
||||
memcpy(temp_attr, attr, sizeof(*temp_attr));
|
||||
sysfs_attr_init(&temp_attr->attr);
|
||||
error = sysfs_create_file(&mod->mkobj.kobj,&temp_attr->attr);
|
||||
error = sysfs_create_file(&mod->mkobj.kobj,
|
||||
&temp_attr->attr);
|
||||
++temp_attr;
|
||||
}
|
||||
}
|
||||
|
@ -1930,7 +1931,7 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
|
|||
/* We compiled with -fno-common. These are not
|
||||
supposed to happen. */
|
||||
pr_debug("Common symbol: %s\n", name);
|
||||
printk("%s: please compile with -fno-common\n",
|
||||
pr_warn("%s: please compile with -fno-common\n",
|
||||
mod->name);
|
||||
ret = -ENOEXEC;
|
||||
break;
|
||||
|
@ -2710,7 +2711,7 @@ static int find_module_sections(struct module *mod, struct load_info *info)
|
|||
* This shouldn't happen with same compiler and binutils
|
||||
* building all parts of the module.
|
||||
*/
|
||||
printk(KERN_WARNING "%s: has both .ctors and .init_array.\n",
|
||||
pr_warn("%s: has both .ctors and .init_array.\n",
|
||||
mod->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -2998,8 +2999,10 @@ static int do_init_module(struct module *mod)
|
|||
if (mod->init != NULL)
|
||||
ret = do_one_initcall(mod->init);
|
||||
if (ret < 0) {
|
||||
/* Init routine failed: abort. Try to protect us from
|
||||
buggy refcounters. */
|
||||
/*
|
||||
* Init routine failed: abort. Try to protect us from
|
||||
* buggy refcounters.
|
||||
*/
|
||||
mod->state = MODULE_STATE_GOING;
|
||||
synchronize_sched();
|
||||
module_put(mod);
|
||||
|
@ -3646,7 +3649,7 @@ static int m_show(struct seq_file *m, void *p)
|
|||
if (mod->taints)
|
||||
seq_printf(m, " %s", module_flags(mod, buf));
|
||||
|
||||
seq_printf(m, "\n");
|
||||
seq_puts(m, "\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue