cosmetic: kbuild: clean-up coding style (sync with Linux 3.16-rc1)

Import the following trivial commits from Linux v3.16-rc1: bb66fc6 kbuild: trivial - use tabs for code indent where possible 7eb6e34 kbuild: trivial - remove trailing empty lines 3fbb43d kbuild: trivial - fix comment block indent 38385f8 kbuild: trivial - remove trailing spaces Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

cosmetic: kbuild: clean-up coding style (sync with Linux 3.16-rc1)
Import the following trivial commits from Linux v3.16-rc1: bb66fc6 kbuild: trivial - use tabs for code indent where possible 7eb6e34 kbuild: trivial - remove trailing empty lines 3fbb43d kbuild: trivial - fix comment block indent 38385f8 kbuild: trivial - remove trailing spaces Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Masahiro Yamada · Tom Rini
1 parent 9e546ee9c9
Showing 6 changed files with 48 additions and 49 deletions Side-by-side Diff
Makefile
scripts/Makefile.build
scripts/Makefile.host
scripts/Makefile.lib
scripts/basic/fixdep.c
scripts/docproc.c
@@ -244,18 +244,18 @@
 KBUILD_MODULES :=
 KBUILD_BUILTIN := 1
  
-#	If we have only "make modules", don't compile built-in objects.
-#	When we're building modules with modversions, we need to consider
-#	the built-in objects during the descend as well, in order to
-#	make sure the checksums are up to date before we record them.
+# If we have only "make modules", don't compile built-in objects.
+# When we're building modules with modversions, we need to consider
+# the built-in objects during the descend as well, in order to
+# make sure the checksums are up to date before we record them.
  
 ifeq ($(MAKECMDGOALS),modules)
   KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
 endif
  
-#	If we have "make <whatever> modules", compile modules
-#	in addition to whatever we do anyway.
-#	Just "make" or "make all" shall build modules as well
+# If we have "make <whatever> modules", compile modules
+# in addition to whatever we do anyway.
+# Just "make" or "make all" shall build modules as well
  
 # U-Boot does not need modules
 #ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)
@@ -1219,7 +1219,7 @@
  
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += include/config include/generated          \
-                  .tmp_objdiff
+		  .tmp_objdiff
 MRPROPER_FILES += .config .config.old \
 		  tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
 		  include/config.h include/config.mk
@@ -369,7 +369,7 @@
 $(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
  
 quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
-cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $< 
+cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $<
  
 $(obj)/%.s: $(src)/%.S FORCE
 	$(call if_changed_dep,as_s_S)
@@ -463,7 +463,7 @@
 $(filter $(addprefix $(obj)/,         \
 $($(subst $(obj)/,,$(@:.o=-objs)))    \
 $($(subst $(obj)/,,$(@:.o=-y)))), $^)
- 
+
 quiet_cmd_link_multi-y = LD      $@
 cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
  
@@ -166,5 +166,5 @@
 	$(call if_changed,host-cshlib)
  
 targets += $(host-csingle)  $(host-cmulti) $(host-cobjs)\
-	   $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) 
+	   $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
@@ -27,7 +27,7 @@
 # ---------------------------------------------------------------------------
 # o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
 #   and add the directory to the list of dirs to descend into: $(subdir-y)
-# o if we encounter foo/ in $(obj-m), remove it from $(obj-m) 
+# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
 #   and add the directory to the list of dirs to descend into: $(subdir-m)
  
 # Determine modorder.
@@ -46,7 +46,7 @@
  
 subdir-ym	:= $(sort $(subdir-y) $(subdir-m))
  
-# if $(foo-objs) exists, foo.o is a composite object 
+# if $(foo-objs) exists, foo.o is a composite object
 multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
 multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
 multi-used   := $(multi-used-y) $(multi-used-m)
@@ -91,7 +91,7 @@
  
 # These flags are needed for modversions and compiling, so we define them here
 # already
-# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will 
+# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will
 # end up in (or would, if it gets compiled in)
 # Note: Files that end up in two or more modules are compiled without the
 #       KBUILD_MODNAME definition. The reason is that any made-up name would
@@ -212,7 +212,7 @@
  
 # Commands useful for building a boot image
 # ===========================================================================
-# 
+#
 #	Use as following:
 #
 #	target: source(s) FORCE
@@ -226,7 +226,7 @@
  
 quiet_cmd_ld = LD      $@
 cmd_ld = $(LD) $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) \
-	       $(filter-out FORCE,$^) -o $@ 
+	       $(filter-out FORCE,$^) -o $@
  
 # Objcopy
 # ---------------------------------------------------------------------------
@@ -409,10 +409,10 @@
 		exit(2);
 	}
 	if (fstat(fd, &st) < 0) {
-                fprintf(stderr, "fixdep: error fstat'ing depfile: ");
-                perror(depfile);
-                exit(2);
-        }
+		fprintf(stderr, "fixdep: error fstat'ing depfile: ");
+		perror(depfile);
+		exit(2);
+	}
 	if (st.st_size == 0) {
 		fprintf(stderr,"fixdep: %s is empty\n",depfile);
 		close(fd);
@@ -154,7 +154,7 @@
 static void add_new_symbol(struct symfile *sym, char * symname)
 {
 	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);
 }
  
@@ -215,7 +215,7 @@
 			char *p;
 			char *e;
 			if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) ||
-                            ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
+			    ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
 				/* Skip EXPORT_SYMBOL{_GPL} */
 				while (isalnum(*p) || *p == '_')
 					p++;
  
  
@@ -291,28 +291,28 @@
 static void singfunc(char * filename, char * line)
 {
 	char *vec[200]; /* Enough for specific functions */
-        int i, idx = 0;
-        int startofsym = 1;
+	int i, idx = 0;
+	int startofsym = 1;
 	vec[idx++] = KERNELDOC;
 	vec[idx++] = DOCBOOK;
 	vec[idx++] = SHOWNOTFOUND;
  
-        /* Split line up in individual parameters preceded by FUNCTION */
-        for (i=0; line[i]; i++) {
-                if (isspace(line[i])) {
-                        line[i] = '\0';
-                        startofsym = 1;
-                        continue;
-                }
-                if (startofsym) {
-                        startofsym = 0;
-                        vec[idx++] = FUNCTION;
-                        vec[idx++] = &line[i];
-                }
-        }
+	/* Split line up in individual parameters preceded by FUNCTION */
+	for (i=0; line[i]; i++) {
+		if (isspace(line[i])) {
+			line[i] = '\0';
+			startofsym = 1;
+			continue;
+		}
+		if (startofsym) {
+			startofsym = 0;
+			vec[idx++] = FUNCTION;
+			vec[idx++] = &line[i];
+		}
+	}
 	for (i = 0; i < idx; i++) {
-        	if (strcmp(vec[i], FUNCTION))
-        		continue;
+		if (strcmp(vec[i], FUNCTION))
+			continue;
 		consume_symbol(vec[i + 1]);
 	}
 	vec[idx++] = filename;
  
@@ -460,14 +460,14 @@
 					break;
 				case 'D':
 					while (*s && !isspace(*s)) s++;
-                                        *s = '\0';
-                                        symbolsonly(line+2);
-                                        break;
+					*s = '\0';
+					symbolsonly(line+2);
+					break;
 				case 'F':
 					/* filename */
 					while (*s && !isspace(*s)) s++;
 					*s++ = '\0';
-                                        /* function names */
+					/* function names */
 					while (isspace(*s))
 						s++;
 					singlefunctions(line +2, s);
@@ -515,11 +515,11 @@
 	}
 	/* Open file, exit on error */
 	infile = fopen(argv[2], "r");
-        if (infile == NULL) {
-                fprintf(stderr, "docproc: ");
-                perror(argv[2]);
-                exit(2);
-        }
+	if (infile == NULL) {
+		fprintf(stderr, "docproc: ");
+		perror(argv[2]);
+		exit(2);
+	}
  
 	if (strcmp("doc", argv[1]) == 0) {
 		/* Need to do this in two passes.
...	...	@@ -244,18 +244,18 @@
244	244	KBUILD_MODULES :=
245	245	KBUILD_BUILTIN := 1
246	246
247		-# If we have only "make modules", don't compile built-in objects.
248		-# When we're building modules with modversions, we need to consider
249		-# the built-in objects during the descend as well, in order to
250		-# make sure the checksums are up to date before we record them.
	247	+# If we have only "make modules", don't compile built-in objects.
	248	+# When we're building modules with modversions, we need to consider
	249	+# the built-in objects during the descend as well, in order to
	250	+# make sure the checksums are up to date before we record them.
251	251
252	252	ifeq ($(MAKECMDGOALS),modules)
253	253	KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
254	254	endif
255	255
256		-# If we have "make <whatever> modules", compile modules
257		-# in addition to whatever we do anyway.
258		-# Just "make" or "make all" shall build modules as well
	256	+# If we have "make <whatever> modules", compile modules
	257	+# in addition to whatever we do anyway.
	258	+# Just "make" or "make all" shall build modules as well
259	259
260	260	# U-Boot does not need modules
261	261	#ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)
...	...	@@ -1219,7 +1219,7 @@
1219	1219
1220	1220	# Directories & files removed with 'make mrproper'
1221	1221	MRPROPER_DIRS += include/config include/generated \
1222		- .tmp_objdiff
	1222	+ .tmp_objdiff
1223	1223	MRPROPER_FILES += .config .config.old \
1224	1224	tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
1225	1225	include/config.h include/config.mk
...	...	@@ -369,7 +369,7 @@
369	369	$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
370	370
371	371	quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
372		-cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
	372	+cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
373	373
374	374	$(obj)/%.s: $(src)/%.S FORCE
375	375	$(call if_changed_dep,as_s_S)
...	...	@@ -463,7 +463,7 @@
463	463	$(filter $(addprefix $(obj)/, \
464	464	$($(subst $(obj)/,,$(@:.o=-objs))) \
465	465	$($(subst $(obj)/,,$(@:.o=-y)))), $^)
466		-
	466	+
467	467	quiet_cmd_link_multi-y = LD $@
468	468	cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
469	469
...	...	@@ -166,5 +166,5 @@
166	166	$(call if_changed,host-cshlib)
167	167
168	168	targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
169		- $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
	169	+ $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
...	...	@@ -27,7 +27,7 @@
27	27	# ---------------------------------------------------------------------------
28	28	# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
29	29	# and add the directory to the list of dirs to descend into: $(subdir-y)
30		-# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
	30	+# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
31	31	# and add the directory to the list of dirs to descend into: $(subdir-m)
32	32
33	33	# Determine modorder.
...	...	@@ -46,7 +46,7 @@
46	46
47	47	subdir-ym := $(sort $(subdir-y) $(subdir-m))
48	48
49		-# if $(foo-objs) exists, foo.o is a composite object
	49	+# if $(foo-objs) exists, foo.o is a composite object
50	50	multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
51	51	multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
52	52	multi-used := $(multi-used-y) $(multi-used-m)
...	...	@@ -91,7 +91,7 @@
91	91
92	92	# These flags are needed for modversions and compiling, so we define them here
93	93	# already
94		-# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will
	94	+# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will
95	95	# end up in (or would, if it gets compiled in)
96	96	# Note: Files that end up in two or more modules are compiled without the
97	97	# KBUILD_MODNAME definition. The reason is that any made-up name would
...	...	@@ -212,7 +212,7 @@
212	212
213	213	# Commands useful for building a boot image
214	214	# ===========================================================================
215		-#
	215	+#
216	216	# Use as following:
217	217	#
218	218	# target: source(s) FORCE
...	...	@@ -226,7 +226,7 @@
226	226
227	227	quiet_cmd_ld = LD $@
228	228	cmd_ld = $(LD) $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) \
229		- $(filter-out FORCE,$^) -o $@
	229	+ $(filter-out FORCE,$^) -o $@
230	230
231	231	# Objcopy
232	232	# ---------------------------------------------------------------------------
...	...	@@ -409,10 +409,10 @@
409	409	exit(2);
410	410	}
411	411	if (fstat(fd, &st) < 0) {
412		- fprintf(stderr, "fixdep: error fstat'ing depfile: ");
413		- perror(depfile);
414		- exit(2);
415		- }
	412	+ fprintf(stderr, "fixdep: error fstat'ing depfile: ");
	413	+ perror(depfile);
	414	+ exit(2);
	415	+ }
416	416	if (st.st_size == 0) {
417	417	fprintf(stderr,"fixdep: %s is empty\n",depfile);
418	418	close(fd);
...	...	@@ -154,7 +154,7 @@
154	154	static void add_new_symbol(struct symfile sym, char symname)
155	155	{
156	156	sym->symbollist =
157		- realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
	157	+ realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
158	158	sym->symbollist[sym->symbolcnt++].name = strdup(symname);
159	159	}
160	160
...	...	@@ -215,7 +215,7 @@
215	215	char *p;
216	216	char *e;
217	217	if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) \|\|
218		- ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
	218	+ ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
219	219	/* Skip EXPORT_SYMBOL{_GPL} */
220	220	while (isalnum(p) \|\| p == '_')
221	221	p++;
222	222
223	223
...	...	@@ -291,28 +291,28 @@
291	291	static void singfunc(char * filename, char * line)
292	292	{
293	293	char vec[200]; / Enough for specific functions */
294		- int i, idx = 0;
295		- int startofsym = 1;
	294	+ int i, idx = 0;
	295	+ int startofsym = 1;
296	296	vec[idx++] = KERNELDOC;
297	297	vec[idx++] = DOCBOOK;
298	298	vec[idx++] = SHOWNOTFOUND;
299	299
300		- /* Split line up in individual parameters preceded by FUNCTION */
301		- for (i=0; line[i]; i++) {
302		- if (isspace(line[i])) {
303		- line[i] = '\0';
304		- startofsym = 1;
305		- continue;
306		- }
307		- if (startofsym) {
308		- startofsym = 0;
309		- vec[idx++] = FUNCTION;
310		- vec[idx++] = &line[i];
311		- }
312		- }
	300	+ /* Split line up in individual parameters preceded by FUNCTION */
	301	+ for (i=0; line[i]; i++) {
	302	+ if (isspace(line[i])) {
	303	+ line[i] = '\0';
	304	+ startofsym = 1;
	305	+ continue;
	306	+ }
	307	+ if (startofsym) {
	308	+ startofsym = 0;
	309	+ vec[idx++] = FUNCTION;
	310	+ vec[idx++] = &line[i];
	311	+ }
	312	+ }
313	313	for (i = 0; i < idx; i++) {
314		- if (strcmp(vec[i], FUNCTION))
315		- continue;
	314	+ if (strcmp(vec[i], FUNCTION))
	315	+ continue;
316	316	consume_symbol(vec[i + 1]);
317	317	}
318	318	vec[idx++] = filename;
319	319
...	...	@@ -460,14 +460,14 @@
460	460	break;
461	461	case 'D':
462	462	while (s && !isspace(s)) s++;
463		- *s = '\0';
464		- symbolsonly(line+2);
465		- break;
	463	+ *s = '\0';
	464	+ symbolsonly(line+2);
	465	+ break;
466	466	case 'F':
467	467	/* filename */
468	468	while (s && !isspace(s)) s++;
469	469	*s++ = '\0';
470		- /* function names */
	470	+ /* function names */
471	471	while (isspace(*s))
472	472	s++;
473	473	singlefunctions(line +2, s);
...	...	@@ -515,11 +515,11 @@
515	515	}
516	516	/* Open file, exit on error */
517	517	infile = fopen(argv[2], "r");
518		- if (infile == NULL) {
519		- fprintf(stderr, "docproc: ");
520		- perror(argv[2]);
521		- exit(2);
522		- }
	518	+ if (infile == NULL) {
	519	+ fprintf(stderr, "docproc: ");
	520	+ perror(argv[2]);
	521	+ exit(2);
	522	+ }
523	523
524	524	if (strcmp("doc", argv[1]) == 0) {
525	525	/* Need to do this in two passes.