We want the fixes in here for merging and testing.
Showing the changes to scripts (3 of 812 files). Show all
Unified · Split
| @@ -3570,15 +3570,6 @@ sub process { · 3569 unmodified lines | ||
| 3570 | 3570 | } |
| 3571 | 3571 | } |
| 3572 | 3572 | |
| 3573 | −# check for uses of DEFINE_PCI_DEVICE_TABLE | |
| 3574 | − if ($line =~ /\bDEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=/) { | |
| 3575 | − if (WARN("DEFINE_PCI_DEVICE_TABLE", | |
| 3576 | − "Prefer struct pci_device_id over deprecated DEFINE_PCI_DEVICE_TABLE\n" . $herecurr) && | |
| 3577 | − $fix) { | |
| 3578 | − $fixed[$fixlinenr] =~ s/\b(?:static\s+|)DEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=\s*/static const struct pci_device_id $1\[\] = /; | |
| 3579 | − } | |
| 3580 | − } | |
| 3581 | − | |
| 3582 | 3573 | # check for new typedefs, only function parameters and sparse annotations |
| 3583 | 3574 | # make sense. |
| 3584 | 3575 | if ($line =~ /\btypedef\s/ && |
| @@ -2136,9 +2136,11 @@ sub vcs_file_exists { · 2135 unmodified lines | ||
| 2136 | 2136 | |
| 2137 | 2137 | my $cmd = $VCS_cmds{"file_exists_cmd"}; |
| 2138 | 2138 | $cmd =~ s/(\$\w+)/$1/eeg; # interpolate $cmd |
| 2139 | − | |
| 2139 | + $cmd .= " 2>&1"; | |
| 2140 | 2140 | $exists = &{$VCS_cmds{"execute_cmd"}}($cmd); |
| 2141 | 2141 | |
| 2142 | + return 0 if ($? != 0); | |
| 2143 | + | |
| 2142 | 2144 | return $exists; |
| 2143 | 2145 | } |
| 2144 | 2146 | |
| @@ -206,7 +206,6 @@ regex_c=( · 205 unmodified lines | ||
| 206 | 206 | '/\<DEFINE_PER_CPU_SHARED_ALIGNED([^,]*, *\([[:alnum:]_]*\)/\1/v/' |
| 207 | 207 | '/\<DECLARE_WAIT_QUEUE_HEAD(\([[:alnum:]_]*\)/\1/v/' |
| 208 | 208 | '/\<DECLARE_\(TASKLET\|WORK\|DELAYED_WORK\)(\([[:alnum:]_]*\)/\2/v/' |
| 209 | − '/\<DEFINE_PCI_DEVICE_TABLE(\([[:alnum:]_]*\)/\1/v/' | |
| 210 | 209 | '/\(^\s\)OFFSET(\([[:alnum:]_]*\)/\2/v/' |
| 211 | 210 | '/\(^\s\)DEFINE(\([[:alnum:]_]*\)/\2/v/' |
| 212 | 211 | '/\<DEFINE_HASHTABLE(\([[:alnum:]_]*\)/\1/v/' |