redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

kbuild: trivial - use tabs for code indent where possible 

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
hifive-unleashed-5.1
Masahiro Yamada 2014-06-10 19:08:13 +09:00 committed by Michal Marek
parent 7eb6e34052
commit bb66fc6719
19 changed files with 85 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/basic/fixdep.c
View File

@ -409,10 +409,10 @@ static void print_deps(void)
exit(2); exit(2);
} }
if (fstat(fd, &st) < 0) { if (fstat(fd, &st) < 0) {
fprintf(stderr, "fixdep: error fstat'ing depfile: "); fprintf(stderr, "fixdep: error fstat'ing depfile: ");
perror(depfile); perror(depfile);
exit(2); exit(2);
} }
if (st.st_size == 0) { if (st.st_size == 0) {
fprintf(stderr,"fixdep: %s is empty\n",depfile); fprintf(stderr,"fixdep: %s is empty\n",depfile);
close(fd); close(fd);

56
scripts/docproc.c
View File

@ -154,7 +154,7 @@ int symfilecnt = 0;
static void add_new_symbol(struct symfile *sym, char * symname) static void add_new_symbol(struct symfile *sym, char * symname)
{ {
sym->symbollist = sym->symbollist =
realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *)); realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
sym->symbollist[sym->symbolcnt++].name = strdup(symname); sym->symbollist[sym->symbolcnt++].name = strdup(symname);
} }
@ -215,7 +215,7 @@ static void find_export_symbols(char * filename)
char *p; char *p;
char *e; char *e;
if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) || if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) ||
((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) { ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
/* Skip EXPORT_SYMBOL{_GPL} */ /* Skip EXPORT_SYMBOL{_GPL} */
while (isalnum(*p) || *p == '_') while (isalnum(*p) || *p == '_')
p++; p++;
@ -291,28 +291,28 @@ static void extfunc(char * filename) { docfunctions(filename, FUNCTION); }
static void singfunc(char * filename, char * line) static void singfunc(char * filename, char * line)
{ {
char *vec[200]; /* Enough for specific functions */ char *vec[200]; /* Enough for specific functions */
int i, idx = 0; int i, idx = 0;
int startofsym = 1; int startofsym = 1;
vec[idx++] = KERNELDOC; vec[idx++] = KERNELDOC;
vec[idx++] = DOCBOOK; vec[idx++] = DOCBOOK;
vec[idx++] = SHOWNOTFOUND; vec[idx++] = SHOWNOTFOUND;
/* Split line up in individual parameters preceded by FUNCTION */ /* Split line up in individual parameters preceded by FUNCTION */
for (i=0; line[i]; i++) { for (i=0; line[i]; i++) {
if (isspace(line[i])) { if (isspace(line[i])) {
line[i] = '\0'; line[i] = '\0';
startofsym = 1; startofsym = 1;
continue; continue;
} }
if (startofsym) { if (startofsym) {
startofsym = 0; startofsym = 0;
vec[idx++] = FUNCTION; vec[idx++] = FUNCTION;
vec[idx++] = &line[i]; vec[idx++] = &line[i];
} }
} }
for (i = 0; i < idx; i++) { for (i = 0; i < idx; i++) {
if (strcmp(vec[i], FUNCTION)) if (strcmp(vec[i], FUNCTION))
continue; continue;
consume_symbol(vec[i + 1]); consume_symbol(vec[i + 1]);
} }
vec[idx++] = filename; vec[idx++] = filename;
@ -460,14 +460,14 @@ static void parse_file(FILE *infile)
break; break;
case 'D': case 'D':
while (*s && !isspace(*s)) s++; while (*s && !isspace(*s)) s++;
*s = '\0'; *s = '\0';
symbolsonly(line+2); symbolsonly(line+2);
break; break;
case 'F': case 'F':
/* filename */ /* filename */
while (*s && !isspace(*s)) s++; while (*s && !isspace(*s)) s++;
*s++ = '\0'; *s++ = '\0';
/* function names */ /* function names */
while (isspace(*s)) while (isspace(*s))
s++; s++;
singlefunctions(line +2, s); singlefunctions(line +2, s);
@ -515,11 +515,11 @@ int main(int argc, char *argv[])
} }
/* Open file, exit on error */ /* Open file, exit on error */
infile = fopen(argv[2], "r"); infile = fopen(argv[2], "r");
if (infile == NULL) { if (infile == NULL) {
fprintf(stderr, "docproc: "); fprintf(stderr, "docproc: ");
perror(argv[2]); perror(argv[2]);
exit(2); exit(2);
} }
if (strcmp("doc", argv[1]) == 0) { if (strcmp("doc", argv[1]) == 0) {
/* Need to do this in two passes. /* Need to do this in two passes.

2
scripts/kallsyms.c
View File

@ -123,7 +123,7 @@ static int read_symbol(FILE *in, struct sym_entry *s)
} }
if (strlen(str) > KSYM_NAME_LEN) { if (strlen(str) > KSYM_NAME_LEN) {
fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n" fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n"
"Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n", "Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n",
str, strlen(str), KSYM_NAME_LEN); str, strlen(str), KSYM_NAME_LEN);
return -1; return -1;
} }

2
scripts/kconfig/conf.c
View File

@ -696,7 +696,7 @@ int main(int ac, char **av)
} else if (input_mode == savedefconfig) { } else if (input_mode == savedefconfig) {
if (conf_write_defconfig(defconfig_file)) { if (conf_write_defconfig(defconfig_file)) {
fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"), fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
defconfig_file); defconfig_file);
return 1; return 1;
} }
} else if (input_mode != listnewconfig) { } else if (input_mode != listnewconfig) {

2
scripts/kconfig/gconf.c
View File

@ -1404,7 +1404,7 @@ static void display_tree(struct menu *menu)
&& (tree == tree2)) && (tree == tree2))
continue; continue;
/* /*
if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
|| (view_mode == FULL_VIEW) || (view_mode == FULL_VIEW)
|| (view_mode == SPLIT_VIEW))*/ || (view_mode == SPLIT_VIEW))*/

4
scripts/kconfig/lxdialog/checklist.c
View File

@ -168,13 +168,13 @@ do_resize:
/* create new window for the list */ /* create new window for the list */
list = subwin(dialog, list_height, list_width, y + box_y + 1, list = subwin(dialog, list_height, list_width, y + box_y + 1,
x + box_x + 1); x + box_x + 1);
keypad(list, TRUE); keypad(list, TRUE);
/* draw a box around the list items */ /* draw a box around the list items */
draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2, draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2,
dlg.menubox_border.atr, dlg.menubox.atr); dlg.menubox_border.atr, dlg.menubox.atr);
/* Find length of longest item in order to center checklist */ /* Find length of longest item in order to center checklist */
check_x = 0; check_x = 0;

2
scripts/kconfig/lxdialog/inputbox.c
View File

@ -42,7 +42,7 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
* Display a dialog box for inputing a string * Display a dialog box for inputing a string
*/ */
int dialog_inputbox(const char *title, const char *prompt, int height, int width, int dialog_inputbox(const char *title, const char *prompt, int height, int width,
const char *init) const char *init)
{ {
int i, x, y, box_y, box_x, box_width; int i, x, y, box_y, box_x, box_width;
int input_x = 0, key = 0, button = -1; int input_x = 0, key = 0, button = -1;

4
scripts/kconfig/lxdialog/menubox.c
View File

@ -64,7 +64,7 @@ static int menu_width, item_x;
* Print menu item * Print menu item
*/ */
static void do_print_item(WINDOW * win, const char *item, int line_y, static void do_print_item(WINDOW * win, const char *item, int line_y,
int selected, int hotkey) int selected, int hotkey)
{ {
int j; int j;
char *menu_item = malloc(menu_width + 1); char *menu_item = malloc(menu_width + 1);
@ -182,7 +182,7 @@ static void do_scroll(WINDOW *win, int *scroll, int n)
* Display a menu for choosing among a number of options * Display a menu for choosing among a number of options
*/ */
int dialog_menu(const char *title, const char *prompt, int dialog_menu(const char *title, const char *prompt,
const void *selected, int *s_scroll) const void *selected, int *s_scroll)
{ {
int i, j, x, y, box_x, box_y; int i, j, x, y, box_x, box_y;
int height, width, menu_height; int height, width, menu_height;

2
scripts/kconfig/lxdialog/util.c
View File

@ -623,7 +623,7 @@ void item_make(const char *fmt, ...)
void item_add_str(const char *fmt, ...) void item_add_str(const char *fmt, ...)
{ {
va_list ap; va_list ap;
size_t avail; size_t avail;
avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str); avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str);

2
scripts/kconfig/mconf.c
View File

@ -299,7 +299,7 @@ static void set_config_filename(const char *config_filename)
int size; int size;
size = snprintf(menu_backtitle, sizeof(menu_backtitle), size = snprintf(menu_backtitle, sizeof(menu_backtitle),
"%s - %s", config_filename, rootmenu.prompt->text); "%s - %s", config_filename, rootmenu.prompt->text);
if (size >= sizeof(menu_backtitle)) if (size >= sizeof(menu_backtitle))
menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
set_dialog_backtitle(menu_backtitle); set_dialog_backtitle(menu_backtitle);

6
scripts/kconfig/menu.c
View File

@ -258,8 +258,8 @@ static void sym_check_prop(struct symbol *sym)
"config symbol '%s' uses select, but is " "config symbol '%s' uses select, but is "
"not boolean or tristate", sym->name); "not boolean or tristate", sym->name);
else if (sym2->type != S_UNKNOWN && else if (sym2->type != S_UNKNOWN &&
sym2->type != S_BOOLEAN && sym2->type != S_BOOLEAN &&
sym2->type != S_TRISTATE) sym2->type != S_TRISTATE)
prop_warn(prop, prop_warn(prop,
"'%s' has wrong type. 'select' only " "'%s' has wrong type. 'select' only "
"accept arguments of boolean and " "accept arguments of boolean and "
@ -268,7 +268,7 @@ static void sym_check_prop(struct symbol *sym)
case P_RANGE: case P_RANGE:
if (sym->type != S_INT && sym->type != S_HEX) if (sym->type != S_INT && sym->type != S_HEX)
prop_warn(prop, "range is only allowed " prop_warn(prop, "range is only allowed "
"for int or hex symbols"); "for int or hex symbols");
if (!menu_validate_number(sym, prop->expr->left.sym) || if (!menu_validate_number(sym, prop->expr->left.sym) ||
!menu_validate_number(sym, prop->expr->right.sym)) !menu_validate_number(sym, prop->expr->right.sym))
prop_warn(prop, "range is invalid"); prop_warn(prop, "range is invalid");

4
scripts/kconfig/zconf.l
View File

@ -27,8 +27,8 @@ static char *text;
static int text_size, text_asize; static int text_size, text_asize;
struct buffer { struct buffer {
struct buffer *parent; struct buffer *parent;
YY_BUFFER_STATE state; YY_BUFFER_STATE state;
}; };
struct buffer *current_buf; struct buffer *current_buf;

4
scripts/kconfig/zconf.lex.c_shipped
View File

@ -789,8 +789,8 @@ static char *text;
static int text_size, text_asize; static int text_size, text_asize;
struct buffer { struct buffer {
struct buffer *parent; struct buffer *parent;
YY_BUFFER_STATE state; YY_BUFFER_STATE state;
}; };
struct buffer *current_buf; struct buffer *current_buf;

2
scripts/kconfig/zconf.tab.c_shipped
View File

@ -2314,7 +2314,7 @@ void conf_parse(const char *name)
for_all_symbols(i, sym) { for_all_symbols(i, sym) {
if (sym_check_deps(sym)) if (sym_check_deps(sym))
zconfnerrs++; zconfnerrs++;
} }
if (zconfnerrs) if (zconfnerrs)
exit(1); exit(1);
sym_set_change_count(1); sym_set_change_count(1);

2
scripts/kconfig/zconf.y
View File

@ -510,7 +510,7 @@ void conf_parse(const char *name)
for_all_symbols(i, sym) { for_all_symbols(i, sym) {
if (sym_check_deps(sym)) if (sym_check_deps(sym))
zconfnerrs++; zconfnerrs++;
} }
if (zconfnerrs) if (zconfnerrs)
exit(1); exit(1);
sym_set_change_count(1); sym_set_change_count(1);

34
scripts/mod/file2alias.c
View File

@ -644,28 +644,26 @@ ADD_TO_DEVTABLE("pcmcia", pcmcia_device_id, do_pcmcia_entry);
static int do_of_entry (const char *filename, void *symval, char *alias) static int do_of_entry (const char *filename, void *symval, char *alias)
{ {
int len; int len;
char *tmp; char *tmp;
DEF_FIELD_ADDR(symval, of_device_id, name); DEF_FIELD_ADDR(symval, of_device_id, name);
DEF_FIELD_ADDR(symval, of_device_id, type); DEF_FIELD_ADDR(symval, of_device_id, type);
DEF_FIELD_ADDR(symval, of_device_id, compatible); DEF_FIELD_ADDR(symval, of_device_id, compatible);
len = sprintf (alias, "of:N%sT%s", len = sprintf(alias, "of:N%sT%s", (*name)[0] ? *name : "*",
(*name)[0] ? *name : "*", (*type)[0] ? *type : "*");
(*type)[0] ? *type : "*");
if (compatible[0]) if (compatible[0])
sprintf (&alias[len], "%sC%s", sprintf(&alias[len], "%sC%s", (*type)[0] ? "*" : "",
(*type)[0] ? "*" : "", *compatible);
*compatible);
/* Replace all whitespace with underscores */ /* Replace all whitespace with underscores */
for (tmp = alias; tmp && *tmp; tmp++) for (tmp = alias; tmp && *tmp; tmp++)
if (isspace (*tmp)) if (isspace (*tmp))
*tmp = '_'; *tmp = '_';
add_wildcard(alias); add_wildcard(alias);
return 1; return 1;
} }
ADD_TO_DEVTABLE("of", of_device_id, do_of_entry); ADD_TO_DEVTABLE("of", of_device_id, do_of_entry);

30
scripts/mod/modpost.c
View File

@ -862,7 +862,7 @@ static const char *section_white_list[] =
* without "ax" / "aw". * without "ax" / "aw".
*/ */
static void check_section(const char *modname, struct elf_info *elf, static void check_section(const char *modname, struct elf_info *elf,
Elf_Shdr *sechdr) Elf_Shdr *sechdr)
{ {
const char *sec = sech_name(elf, sechdr); const char *sec = sech_name(elf, sechdr);
@ -1296,12 +1296,12 @@ static void print_section_list(const char * const list[20])
*/ */
static void report_sec_mismatch(const char *modname, static void report_sec_mismatch(const char *modname,
const struct sectioncheck *mismatch, const struct sectioncheck *mismatch,
const char *fromsec, const char *fromsec,
unsigned long long fromaddr, unsigned long long fromaddr,
const char *fromsym, const char *fromsym,
int from_is_func, int from_is_func,
const char *tosec, const char *tosym, const char *tosec, const char *tosym,
int to_is_func) int to_is_func)
{ {
const char *from, *from_p; const char *from, *from_p;
const char *to, *to_p; const char *to, *to_p;
@ -1441,7 +1441,7 @@ static void report_sec_mismatch(const char *modname,
} }
static void check_section_mismatch(const char *modname, struct elf_info *elf, static void check_section_mismatch(const char *modname, struct elf_info *elf,
Elf_Rela *r, Elf_Sym *sym, const char *fromsec) Elf_Rela *r, Elf_Sym *sym, const char *fromsec)
{ {
const char *tosec; const char *tosec;
const struct sectioncheck *mismatch; const struct sectioncheck *mismatch;
@ -1528,7 +1528,7 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
case R_ARM_ABS32: case R_ARM_ABS32:
/* From ARM ABI: (S + A) | T */ /* From ARM ABI: (S + A) | T */
r->r_addend = (int)(long) r->r_addend = (int)(long)
(elf->symtab_start + ELF_R_SYM(r->r_info)); (elf->symtab_start + ELF_R_SYM(r->r_info));
break; break;
case R_ARM_PC24: case R_ARM_PC24:
case R_ARM_CALL: case R_ARM_CALL:
@ -1538,8 +1538,8 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
case R_ARM_THM_JUMP19: case R_ARM_THM_JUMP19:
/* From ARM ABI: ((S + A) | T) - P */ /* From ARM ABI: ((S + A) | T) - P */
r->r_addend = (int)(long)(elf->hdr + r->r_addend = (int)(long)(elf->hdr +
sechdr->sh_offset + sechdr->sh_offset +
(r->r_offset - sechdr->sh_addr)); (r->r_offset - sechdr->sh_addr));
break; break;
default: default:
return 1; return 1;
@ -1571,7 +1571,7 @@ static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
} }
static void section_rela(const char *modname, struct elf_info *elf, static void section_rela(const char *modname, struct elf_info *elf,
Elf_Shdr *sechdr) Elf_Shdr *sechdr)
{ {
Elf_Sym *sym; Elf_Sym *sym;
Elf_Rela *rela; Elf_Rela *rela;
@ -1615,7 +1615,7 @@ static void section_rela(const char *modname, struct elf_info *elf,
} }
static void section_rel(const char *modname, struct elf_info *elf, static void section_rel(const char *modname, struct elf_info *elf,
Elf_Shdr *sechdr) Elf_Shdr *sechdr)
{ {
Elf_Sym *sym; Elf_Sym *sym;
Elf_Rel *rel; Elf_Rel *rel;
@ -1685,7 +1685,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
* be discarded and warns about it. * be discarded and warns about it.
**/ **/
static void check_sec_ref(struct module *mod, const char *modname, static void check_sec_ref(struct module *mod, const char *modname,
struct elf_info *elf) struct elf_info *elf)
{ {
int i; int i;
Elf_Shdr *sechdrs = elf->sechdrs; Elf_Shdr *sechdrs = elf->sechdrs;
@ -1945,7 +1945,7 @@ static int add_versions(struct buffer *b, struct module *mod)
s->name, mod->name); s->name, mod->name);
} else { } else {
merror("\"%s\" [%s.ko] undefined!\n", merror("\"%s\" [%s.ko] undefined!\n",
s->name, mod->name); s->name, mod->name);
err = 1; err = 1;
} }
} }

4
scripts/mod/sumversion.c
View File

@ -214,7 +214,7 @@ static void md4_final_ascii(struct md4_ctx *mctx, char *out, unsigned int len)
mctx->block[14] = mctx->byte_count << 3; mctx->block[14] = mctx->byte_count << 3;
mctx->block[15] = mctx->byte_count >> 29; mctx->block[15] = mctx->byte_count >> 29;
le32_to_cpu_array(mctx->block, (sizeof(mctx->block) - le32_to_cpu_array(mctx->block, (sizeof(mctx->block) -
sizeof(uint64_t)) / sizeof(uint32_t)); sizeof(uint64_t)) / sizeof(uint32_t));
md4_transform(mctx->hash, mctx->block); md4_transform(mctx->hash, mctx->block);
cpu_to_le32_array(mctx->hash, sizeof(mctx->hash) / sizeof(uint32_t)); cpu_to_le32_array(mctx->hash, sizeof(mctx->hash) / sizeof(uint32_t));
@ -367,7 +367,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
break; break;
/* Terminate line at first space, to get rid of final ' \' */ /* Terminate line at first space, to get rid of final ' \' */
while (*p) { while (*p) {
if (isspace(*p)) { if (isspace(*p)) {
*p = '\0'; *p = '\0';
break; break;
} }

2
scripts/tags.sh
View File

@ -281,7 +281,7 @@ xtags()
emacs $1 emacs $1
else else
all_target_sources | xargs $1 -a all_target_sources | xargs $1 -a
fi fi
} }
# Support um (which uses SUBARCH) # Support um (which uses SUBARCH)