提交 · 273f4bef1847ef69f30d7e55f8de876a92639f17 · openeuler / Kernel

26 4月, 2011 40 次提交

staging: Remove unnecessary semicolons when for (foo) {...}; · 273f4bef

由 Joe Perches 提交于 4月 10, 2011

Done via perl script:

$ cat remove_semi_for.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces      = qr/(\{(?:[^\{\}]++|(?-1))*\})/;

foreach my $file (@ARGV) {
    my $f;
    my $text;
    my $oldtext;

    next if ((-d $file));

    open($f, '<', $file)
	or die "$P: Can't open $file for read\n";
    $oldtext = do { local($/) ; <$f> };
    close($f);

    next if ($oldtext eq "");

    $text = $oldtext;

    my $count = 0;
    do {
	$count = 0;
	$count += $text =~ s@\b(for\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
    } while ($count > 0);

    if ($text ne $oldtext) {
	my $newfile = $file;

	open($f, '>', $newfile)
	    or die "$P: Can't open $newfile for write\n";
	print $f $text;
	close($f);
    }
}

$
Signed-off-by: NJoe Perches <joe@perches.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

273f4bef

staging: Remove unnecessary semicolons when while (foo) {...}; · b0b0fb0f

由 Joe Perches 提交于 4月 10, 2011

Done via perl script:

$ cat remove_semi_while.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces      = qr/(\{(?:[^\{\}]++|(?-1))*\})/;

foreach my $file (@ARGV) {
    my $f;
    my $text;
    my $oldtext;

    next if ((-d $file));

    open($f, '<', $file)
	or die "$P: Can't open $file for read\n";
    $oldtext = do { local($/) ; <$f> };
    close($f);

    next if ($oldtext eq "");

    $text = $oldtext;

    my $count = 0;
    do {
	$count = 0;
	$count += $text =~ s@\b(while\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
    } while ($count > 0);

    if ($text ne $oldtext) {
	my $newfile = $file;

	open($f, '>', $newfile)
	    or die "$P: Can't open $newfile for write\n";
	print $f $text;
	close($f);
    }
}

$

One false positive removed.
Signed-off-by: NJoe Perches <joe@perches.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

b0b0fb0f

staging: Remove unnecessary semicolons when if (foo) {...}; · 9fc86028

由 Joe Perches 提交于 4月 10, 2011

Done via perl script:

$ cat remove_semi_if.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces      = qr/(\{(?:[^\{\}]++|(?-1))*\})/;

foreach my $file (@ARGV) {
    my $f;
    my $text;
    my $oldtext;

    next if ((-d $file));

    open($f, '<', $file)
	or die "$P: Can't open $file for read\n";
    $oldtext = do { local($/) ; <$f> };
    close($f);

    next if ($oldtext eq "");

    $text = $oldtext;

    my $count = 0;
    do {
	$count = 0;
	$count += $text =~ s@\b(if\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
    } while ($count > 0);

    if ($text ne $oldtext) {
	my $newfile = $file;

	open($f, '>', $newfile)
	    or die "$P: Can't open $newfile for write\n";
	print $f $text;
	close($f);
    }
}

$
Signed-off-by: NJoe Perches <joe@perches.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

9fc86028

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging into staging-next · 60b0fa1a

由 Greg Kroah-Hartman 提交于 4月 25, 2011

* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging:
  staging: rt2860sta and rt2870sta: Remove drivers replaced in net/wireless
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

60b0fa1a

staging: istallion: fix arbitrary kernel memory reads/writes · 5d46f326

由 Vasiliy Kulikov 提交于 4月 14, 2011

stli_brdstats is defined as global variable.  After de-BKL-ization in
the patch b4eda9cb an access to the variable is not serialized
anymore.  This leads to the race window between the check and the use
in stli_getbrdstats():

        if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
                return -EFAULT;
        if (stli_brdstats.brd >= STL_MAXBRDS) <<<
                return -ENODEV;
        brdp = stli_brds[stli_brdstats.brd];  <<<

If one process calls COM_GETBRDSTATS ioctl() with sane .brd, second
process calls COM_GETBRDSTATS ioctl() with invalid .brd, and the
second process' copy_from_user() executes exactly between the check and
stli_brds[] indexation of the first process, then the first process gets
contents of memory at *stli_brds[stli_brdstats.brd] address.  Also
the resulting .nrpanels field may be too big, in this case
stli_brdstats.panels array overflows.
Signed-off-by: NVasiliy Kulikov <segoon@openwall.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

5d46f326

modules: Enabled dynamic debugging for staging modules · 7816c45b

由 Roland Vossen 提交于 4月 07, 2011

Driver modules from the staging directory are marked 'tainted'
by module.c. Subsequently, tainted modules are denied dynamic
debugging. This is unwanted behavior, since staging modules should
be able to use the dynamic debugging mechanism.

Please merge this also into the staging-linus branch.
Signed-off-by: NRoland Vossen <rvossen@broadcom.com>
Acked-by: NJason Baron <jbaron@redhat.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

7816c45b

staging: brcm80211: Add dhdsdio_chip_attach in dhd_sdio.c · cb63e4c9

由 Franky Lin 提交于 4月 25, 2011

dhdsdio_chip_attach and it sub functions are added for si/sb utils removal.
It will replace si_attach in following patches.
Signed-off-by: NFranky Lin <frankyl@broadcom.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

cb63e4c9

staging: brcm80211: Add bcmchip.h · ddd0b091

由 Franky Lin 提交于 4月 25, 2011

bcmchip.h contains chip specific core register base address and
address translation macro for core register access. This is
introduced for si/sb utils dependence removal in fullmac driver.
Signed-off-by: NFranky Lin <frankyl@broadcom.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

ddd0b091

staging: brcm80211: remove unnecessary include from nvram_ro.c · 278057db

由 Arend van Spriel 提交于 4月 14, 2011

Source file included bcmotp.h but did not use any declared item
from that include file so it can safely be removed.
Reviewed-by: NRoland Vossen <rvossen@broadcom.com>
Reviewed-by: NHenry Ptasinski <henryp@broadcom.com>
Signed-off-by: NArend van Spriel <arend@broadcom.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

278057db

staging: brcm80211: bugfix for div by zero in minstrel_ht_tx_status · e9c661e0

由 Roland Vossen 提交于 4月 12, 2011

Caused by brcmsmac.ko suppling a 0 value to Mac80211. Mac80211 subsequently
divides by this number. Bug only occurred on AMPDU traffic. This is a fix
for https://bugzilla.kernel.org/show_bug.cgi?id=32032, titled
'Divide error in minstrel_ht_tx_status followed by hang', reported by
Wouter Cloetens.
Signed-off-by: NRoland Vossen <rvossen@broadcom.com>
Reviewed-by: NArend van Spriel <arend@broadcom.com>
Cc: stable <stable@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

e9c661e0

staging: brcm80211: replaced BCME_OK by 0 · a1c5ad81

由 Roland Vossen 提交于 4月 11, 2011

Code cleanup.
Signed-off-by: NRoland Vossen <rvossen@broadcom.com>
Reviewed-by: NArend van Spriel <arend@broadcom.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

a1c5ad81

staging: brcm80211: removed unused error codes · 3b818080

由 Roland Vossen 提交于 4月 11, 2011

Code cleanup.
Signed-off-by: NRoland Vossen <rvossen@broadcom.com>
Reviewed-by: NArend van Spriel <arend@broadcom.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

3b818080

brcm80211: update PCI config space define · 6b80b247

由 Stanislav Fomichev 提交于 4月 10, 2011

- replaced sizeof(struct pci_config_regs) with exact size; removed
  struct
- cleaned up the rest of broadcom PCI specific defines
Signed-off-by: NStanislav Fomichev <kernel@fomichev.me>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

6b80b247

brcm80211: remove unused struct ppb_config_regs · b68692e7

由 Stanislav Fomichev 提交于 4月 10, 2011

Signed-off-by: NStanislav Fomichev <kernel@fomichev.me>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

b68692e7

brcm80211: use native PCI header defines · 85633f62

由 Stanislav Fomichev 提交于 4月 10, 2011

Signed-off-by: NStanislav Fomichev <kernel@fomichev.me>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

85633f62

brcm80211: use native PCI capability defines · d8394285

由 Stanislav Fomichev 提交于 4月 10, 2011

Signed-off-by: NStanislav Fomichev <kernel@fomichev.me>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

d8394285

brcm80211: use native PCI register offsets · d108b7a4

由 Stanislav Fomichev 提交于 4月 10, 2011

Signed-off-by: NStanislav Fomichev <kernel@fomichev.me>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

d108b7a4

ath6kl: fix operations for power management · 8fcf92d1