History

Merge branch 'component-for-driver' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into driver-core-next

Russell writes: These updates fix one bug in the component helper where the matched components are not properly cleaned up when the master fails to bind. I'll provide a version of this for stable trees if it's deemed that we need to backport it. The second patch causes the component helper to ignore duplicate matches when adding components - this is something that was originally needed for imx-drm, but since that has now been updated, we no longer need to skip over a component which has already been matched. The final patch starts the process of updating the component helper API to achieve two goals: to allow the API to be more efficient when deferred probing occurs, and to allow for future improvements to the component helper without having a major impact on the users. This represents groundwork for some other changes; once this has been merged, I will then send two further pull requests (one for the staging tree, and one for the DRM tree) to update the drivers to the new API. This will result in these three commits being shared with those trees.

Greg Kroah-Hartman committed 12 years ago

Commit 868b60e2 parents c9d53c0 6955b58812 files · +11238 −6932Browse files

Showing the changes to scripts (4 of 812 files). Show all

Unified · Split

4 files
  1. scripts/checkpatch.pl +10 −5
  2. scripts/package/builddeb +8 −6
  3. scripts/package/buildtar +1 −2
  4. scripts/recordmcount.h +2 −2
scripts/checkpatch.pl+10−5
@@ -3476,12 +3476,17 @@ sub process { · 3475 unmodified lines
34763476 }
34773477 }
34783478
3479−# unnecessary return in a void function? (a single leading tab, then return;)
3480− if ($sline =~ /^\+\treturn\s*;\s*$/ &&
3481− $prevline =~ /^\+/) {
3479+# unnecessary return in a void function
3480+# at end-of-function, with the previous line a single leading tab, then return;
3481+# and the line before that not a goto label target like "out:"
3482+ if ($sline =~ /^[ \+]}\s*$/ &&
3483+ $prevline =~ /^\+\treturn\s*;\s*$/ &&
3484+ $linenr >= 3 &&
3485+ $lines[$linenr - 3] =~ /^[ +]/ &&
3486+ $lines[$linenr - 3] !~ /^[ +]\s*$Ident\s*:/) {
34823487 WARN("RETURN_VOID",
3483− "void function return statements are not generally useful\n" . $herecurr);
3484− }
3488+ "void function return statements are not generally useful\n" . $hereprev);
3489+ }
34853490
34863491 # if statements using unnecessary parentheses - ie: if ((foo == bar))
34873492 if ($^V && $^V ge 5.10.0 &&
scripts/package/builddeb+8−6
@@ -289,14 +289,16 @@ EOF · 288 unmodified lines
289289
290290 fi
291291
292−# Build header package
293−(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
294−(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
295−(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
292+# Build kernel header package
293+(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
294+(cd $srctree; find arch/$SRCARCH/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
295+(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
296+(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
297+(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
296298 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
297299 mkdir -p "$destdir"
298−(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
299−(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
300+(cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
301+(cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
300302 (cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
301303 ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
302304 rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
scripts/package/buildtar+1−2
@@ -125,12 +125,11 @@ esac · 124 unmodified lines
125125 # Create the tarball
126126 #
127127 (
128− cd "${tmpdir}"
129128 opts=
130129 if tar --owner=root --group=root --help >/dev/null 2>&1; then
131130 opts="--owner=root --group=root"
132131 fi
133− tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}"
132+ tar cf - -C "$tmpdir" boot/ lib/ $opts | ${compress} > "${tarball}${file_ext}"
134133 )
135134
136135 echo "Tarball successfully created in ${tarball}${file_ext}"
scripts/recordmcount.h+2−2
@@ -163,11 +163,11 @@ static int mcount_adjust = 0; · 162 unmodified lines
163163
164164 static int MIPS_is_fake_mcount(Elf_Rel const *rp)
165165 {
166− static Elf_Addr old_r_offset;
166+ static Elf_Addr old_r_offset = ~(Elf_Addr)0;
167167 Elf_Addr current_r_offset = _w(rp->r_offset);
168168 int is_fake;
169169
170− is_fake = old_r_offset &&
170+ is_fake = (old_r_offset != ~(Elf_Addr)0) &&
171171 (current_r_offset - old_r_offset == MIPS_FAKEMCOUNT_OFFSET);
172172 old_r_offset = current_r_offset;
173173

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t