Commits · e9cc5b2bb1c1b121f35d430b0e70a73ce2a7a2e5 · nexedi / linux

15 Jul, 2014 29 commits

staging: dgap: fix a typo in dgap_gettok() · e9cc5b2b

Daeseok Youn authored Jul 15, 2014

The "boar" should be "board".
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

e9cc5b2b

staging: dgap: remove unused case value in dgap_parsefile() · 8e82ce02

Daeseok Youn authored Jul 15, 2014

If rc is zero, this function will returns with an error and
cannot reach switch-case statement.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

8e82ce02

staging: dgap: remove redundant error value check · dfa30ac1

Daeseok Youn authored Jul 15, 2014

The retval in dgap_block_til_ready() is initialized to zero,
and if no error has occurred in this function, the retval has a zero.
So it doesn't need to check "retval" itself.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

dfa30ac1

Staging: bcm: PHSModule.c: Shortened lines · e86bd61e

Matthias Beyer authored Jul 15, 2014

This patch shortenes all lines where possible without code refactoring,
as well as comment lines. It does not change the wording of comments.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

e86bd61e

Staging: bcm: PHSModule.c: Replaced if-else return code with simple return assertion · 3be738ad

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3be738ad

Staging: bcm: PHSModule.c: Replaced member accessing with variable in... · 91283491

Matthias Beyer authored Jul 15, 2014

Staging: bcm: PHSModule.c: Replaced member accessing with variable in CreateSFToClassifierRuleMapping()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

91283491

Staging: bcm: PHSModule.c: Simplified nested if statements by linking them... · 18002f56

Matthias Beyer authored Jul 15, 2014

Staging: bcm: PHSModule.c: Simplified nested if statements by linking them with logical AND in GetPhsRuleEntry()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

18002f56

Staging: bcm: PHSModule.c: Simplified nested if statements by linking them... · 1c53f087

Matthias Beyer authored Jul 15, 2014

Staging: bcm: PHSModule.c: Simplified nested if statements by linking them with logical AND in GetServiceFlowEntry()
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1c53f087

Staging: bcm: PHSModule.c: Simplified nested if statements by linking them... · c842dd2d

Matthias Beyer authored Jul 15, 2014

c842dd2d

Staging: bcm: PHSModule.c: Replaced member accessing with variable in GetServiceFlowEntry() · cf423564

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

cf423564

Staging: bcm: PHSModule.c: Added const keyword to ValidatePHSRUleComplete() argument · 14d8e915

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

14d8e915

Staging: bcm: PHSModule.c: Rewrote ValidatePHSRuleComplete() · cc872f80

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

cc872f80

Staging: bcm: PHSModule.c: Replaced indentation level with goto jump on bad condition · c8020cc9

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

c8020cc9

Staging: bcm: PHSModule.c: Replaced member accessing with variable in free_phs_service() · 3ed150a1

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3ed150a1

Staging: bcm: PHSModule.c: Added missing braces around else block · b43b245f

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

b43b245f

Staging: bcm: PHSModule.c: Whitespace cleanup in PhsCompress() · babb7f94

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

babb7f94

Staging: bcm: PHSModule.c: Replaced member accessing with variables · a984b124

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

a984b124

Staging: bcm: PHSModule.c: Reduced indentation by using jump label in PhsDeleteSFRules() · fc38bc1d

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

fc38bc1d

Staging: bcm: PHSModule.c: Shortened lines · 93cc6ae8

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

93cc6ae8

Staging: bcm: PHSModule.c: Reduced indentation level by using jump label · 525afdd1

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

525afdd1

Staging: bcm: PHSModule.c: Replaced nested if statements with logical AND... · 31f4f3fb

Matthias Beyer authored Jul 15, 2014

Staging: bcm: PHSModule.c: Replaced nested if statements with logical AND concatenation of the conditions
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

31f4f3fb

Staging: bcm: PHSModule.c: Replaced member accessing with variable in PhsDeletePHSRule() · 413852b6

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

413852b6

Staging: bcm: PHSModule.c: Outsourced debug printing for phs classifier entry · c50e0b5c

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

c50e0b5c

Staging: bcm: PHSModule.c: Outsourced debug printing in own function · 20d174e2

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

20d174e2

Staging: bcm: PHSModule.c: Whitespace & Indentation cleanup · ca89a295

Matthias Beyer authored Jul 15, 2014

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

ca89a295

staging: vt6556: Remove double parentheses · 495e2be7

Peter Senna Tschudin authored Jul 14, 2014

This patch cleanup a checkpatch warning by removing double parentheses
from if condition. Additionally it fixes a line over 80 chars.

Tested by compilation only.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

495e2be7

staging: vt6656: set BBvSetAntennaMode in device_init_registers · ed0db513

Malcolm Priestley authored Jul 14, 2014

BBvSetAntennaMode is not set at all, set to byRxAntennaMode
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

ed0db513

staging: vt6656: device.h remove old wireless stats · 6fdd946a

Malcolm Priestley authored Jul 14, 2014

These are dead nolonger of use.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

6fdd946a

drivers: staging: lustre: Use 'force_die' instead of 'die' to avoid compiling issue · d0f17b64

Chen Gang authored Jul 14, 2014

Some of architectures have already defined 'die' as macro, so can not
use it as declaration or definition in other modules, or it will cause
compiling issue.

So use more precise name 'force_die' (like 'wrap_bulk') instead of. And
the related error (with allmodconfig under score):

    CC [M]  drivers/staging/lustre/lustre/ptlrpc/sec.o
  drivers/staging/lustre/lustre/ptlrpc/sec.c: In function 'sptlrpc_cli_ctx_expire':
  drivers/staging/lustre/lustre/ptlrpc/sec.c:309:13: error: 'struct ptlrpc_ctx_ops' has no member named '__die'
    ctx->cc_ops->die(ctx, 0);
               ^
  drivers/staging/lustre/lustre/ptlrpc/sec.c: In function 'ctx_refresh_timeout':
  drivers/staging/lustre/lustre/ptlrpc/sec.c:594:26: error: 'struct ptlrpc_ctx_ops' has no member named '__die'
     req->rq_cli_ctx->cc_ops->die(req->rq_cli_ctx, 0);
                            ^
  make[5]: *** [drivers/staging/lustre/lustre/ptlrpc/sec.o] Error 1
  make[4]: *** [drivers/staging/lustre/lustre/ptlrpc] Error 2
  make[3]: *** [drivers/staging/lustre/lustre] Error 2
  make[2]: *** [drivers/staging/lustre] Error 2
  make[1]: *** [drivers/staging] Error 2
  make: *** [drivers] Error 2
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

d0f17b64

13 Jul, 2014 11 commits

Merge 3.16-rc5 into staging-next · 589e1d10

Greg Kroah-Hartman authored Jul 13, 2014

We want the fixes in -rc5 in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

589e1d10

Linux 3.16-rc5 · 1795cd9b
Linus Torvalds authored Jul 13, 2014

1795cd9b

Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 18b34d9a

Linus Torvalds authored Jul 13, 2014

Pull ext4 bugfixes from Ted Ts'o:
 "More bug fixes for ext4 -- most importantly, a fix for a bug
  introduced in 3.15 that can end up triggering a file system corruption
  error after a journal replay.

  It shouldn't lead to any actual data corruption, but it is scary and
  can force file systems to be remounted read-only, etc"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix potential null pointer dereference in ext4_free_inode
  ext4: fix a potential deadlock in __ext4_es_shrink()
  ext4: revert commit which was causing fs corruption after journal replays
  ext4: disable synchronous transaction batching if max_batch_time==0
  ext4: clarify ext4_error message in ext4_mb_generate_buddy_error()
  ext4: clarify error count warning messages
  ext4: fix unjournalled bg descriptor while initializing inode bitmap

18b34d9a

Merge tag 'iio-for-3.17c' of... · db7c17ec

Greg Kroah-Hartman authored Jul 13, 2014

Merge tag 'iio-for-3.17c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

3rd round of IIO new drivers, cleanups and functionality for the 3.17 cycle.

New drivers
* isl29125 digital color light sensor driver
* TAOS/AMS tcs3414 digital color sensor

Staging graduation
* ad7291 ADC driver.

New functionality
* st_sensors - device tree support and bindings
* mma8452 - device tree support

Cleanups
* Drop redundant variables in a number of drivers.
* Reorder a structure definition to ealy wiht a warning about static
not being at the beginning in the hid-sensors driver.
* Switch a few more drivers away from using explicit sampling_frequency
attribute to providing this through the core.
* Make hid_sensor_get_reporting_interval static as only used within a single
file.
* Drop a redundant check for negative values in an unsigned variable from
ad9832
* Drop some duplicate case labels in the event monitor example code.
* Use devm_ioremap_resource to simplify error handling.
* Use devm_kzalloc within the blackfin timer driver to simplify error
handling and removal.
* A number of cleanups of the ad7291 from Hartmut Knaack in response
to a patch moving it out of staging.
* Core support for the period info element about events. It has been
in the abi for a while, but not added until now to the newer handling
of information related to events.
* Add HAS_IOMEM dependency to mxs_lradc to avoid build issues when testing
enabled.

db7c17ec

staging: rtl8188eu: Rename _rtw_init_mlme_priv() to rtw_init_mlme_priv() · 01e11629
navin patidar authored Jul 13, 2014
```
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
```
01e11629
staging: rtl8188eu: Rename _rtw_free_mlme_priv() to rtw_free_mlme_priv() · 3596d6d6
navin patidar authored Jul 13, 2014
```
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
```
3596d6d6

staging: rtl8188eu: Remove unused function _rtw_enqueue_network() · 246cf9ec

navin patidar authored Jul 13, 2014

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

246cf9ec

staging: rtl8188eu: Remove unused function _rtw_dequeue_network() · 4b5a1c16

navin patidar authored Jul 13, 2014

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4b5a1c16

staging: rtl8188eu: Make _rtw_free_network() static · fe80537a

navin patidar authored Jul 13, 2014

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

fe80537a

staging: rtl8188eu: Rename _rtw_find_network() to rtw_find_network() · 8eca2e5f

navin patidar authored Jul 13, 2014

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

8eca2e5f

staging: rtl8188eu: Rename _rtw_free_network_queue() to rtw_free_network_queue() · 07e49db0
navin patidar authored Jul 13, 2014
```
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
```
07e49db0