mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 12:16:29 -04:00
Code Issues Packages Projects Releases Wiki Activity
457,487 Commits 1 Branch 929 Tags
e86bd61ee6cae2ec09c7f9782d573f9ce3081e44
Commit Graph

457487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias Beyer
e86bd61ee6 Staging: bcm: PHSModule.c: Shortened lines 
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>
 2014-07-15 08:09:49 -07:00
Matthias Beyer
3be738ad55 Staging: bcm: PHSModule.c: Replaced if-else return code with simple return assertion 
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>
 2014-07-15 08:09:49 -07:00
Matthias Beyer
91283491c6 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>
 2014-07-15 08:09:49 -07:00
Matthias Beyer
18002f567f 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>
 2014-07-15 08:09:49 -07:00
Matthias Beyer
1c53f0877e 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>
 2014-07-15 08:09:49 -07:00
Matthias Beyer
c842dd2ddb 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>
 2014-07-15 08:09:49 -07:00
Matthias Beyer
cf423564fa Staging: bcm: PHSModule.c: Replaced member accessing with variable 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>
 2014-07-15 08:09:49 -07:00
Matthias Beyer
14d8e91596 Staging: bcm: PHSModule.c: Added const keyword to ValidatePHSRUleComplete() argument 
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>
 2014-07-15 08:09:49 -07:00
Matthias Beyer
cc872f8070 Staging: bcm: PHSModule.c: Rewrote ValidatePHSRuleComplete() 
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>
 2014-07-15 08:09:48 -07:00
Matthias Beyer
c8020cc93e Staging: bcm: PHSModule.c: Replaced indentation level with goto jump on bad condition 
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>
 2014-07-15 08:09:48 -07:00
Matthias Beyer
3ed150a178 Staging: bcm: PHSModule.c: Replaced member accessing with variable in free_phs_service() 
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>
 2014-07-15 08:09:48 -07:00
Matthias Beyer
b43b245fb3 Staging: bcm: PHSModule.c: Added missing braces around else block 
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>
 2014-07-15 08:09:48 -07:00
Matthias Beyer
babb7f9479 Staging: bcm: PHSModule.c: Whitespace cleanup in PhsCompress() 
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>
 2014-07-15 08:09:48 -07:00
Matthias Beyer
a984b124aa Staging: bcm: PHSModule.c: Replaced member accessing with variables 
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>
 2014-07-15 08:09:48 -07:00
Matthias Beyer
fc38bc1d68 Staging: bcm: PHSModule.c: Reduced indentation by using jump label in PhsDeleteSFRules() 
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>
 2014-07-15 08:09:48 -07:00
Matthias Beyer
93cc6ae8b3 Staging: bcm: PHSModule.c: Shortened lines 
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>
 2014-07-15 08:09:48 -07:00
Matthias Beyer
525afdd170 Staging: bcm: PHSModule.c: Reduced indentation level by using jump label 
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>
 2014-07-15 08:09:48 -07:00
Matthias Beyer
31f4f3fb15 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>
 2014-07-15 08:09:48 -07:00
Matthias Beyer
413852b6d4 Staging: bcm: PHSModule.c: Replaced member accessing with variable in PhsDeletePHSRule() 
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>
 2014-07-15 08:09:47 -07:00
Matthias Beyer
c50e0b5c77 Staging: bcm: PHSModule.c: Outsourced debug printing for phs classifier entry 
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>
 2014-07-15 08:09:47 -07:00
Matthias Beyer
20d174e2b4 Staging: bcm: PHSModule.c: Outsourced debug printing in own function 
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>
 2014-07-15 08:09:47 -07:00
Matthias Beyer
ca89a2950c Staging: bcm: PHSModule.c: Whitespace & Indentation cleanup 
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>
 2014-07-15 08:09:47 -07:00
Peter Senna Tschudin
495e2be7e5 staging: vt6556: Remove double parentheses 
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>
 2014-07-15 08:05:16 -07:00
Malcolm Priestley
ed0db5135f staging: vt6656: set BBvSetAntennaMode in device_init_registers 
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>
 2014-07-15 07:50:52 -07:00
Malcolm Priestley
6fdd946afe staging: vt6656: device.h remove old wireless stats 
These are dead nolonger of use.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-15 07:50:51 -07:00
Chen Gang
d0f17b64ec drivers: staging: lustre: Use 'force_die' instead of 'die' to avoid compiling issue 
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>
 2014-07-14 18:40:12 -07:00
Greg Kroah-Hartman
589e1d10ff Merge 3.16-rc5 into staging-next 
We want the fixes in -rc5 in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 15:35:56 -07:00
Linus Torvalds
1795cd9b3a Linux 3.16-rc5 v3.16-rc5 2014-07-13 14:04:33 -07:00
Linus Torvalds
18b34d9a7a Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 
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
 2014-07-13 13:14:55 -07:00
Greg Kroah-Hartman
db7c17ecbf 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.
 2014-07-13 12:31:47 -07:00
navin patidar
01e1162946 staging: rtl8188eu: Rename _rtw_init_mlme_priv() to rtw_init_mlme_priv() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:29:47 -07:00
navin patidar
3596d6d6d8 staging: rtl8188eu: Rename _rtw_free_mlme_priv() to rtw_free_mlme_priv() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:29:47 -07:00
navin patidar
246cf9ec61 staging: rtl8188eu: Remove unused function _rtw_enqueue_network() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:29:46 -07:00
navin patidar
4b5a1c16ba staging: rtl8188eu: Remove unused function _rtw_dequeue_network() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:29:24 -07:00
navin patidar
fe80537a5c staging: rtl8188eu: Make _rtw_free_network() static 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:59 -07:00
navin patidar
8eca2e5f78 staging: rtl8188eu: Rename _rtw_find_network() to rtw_find_network() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:59 -07:00
navin patidar
07e49db016 staging: rtl8188eu: Rename _rtw_free_network_queue() to rtw_free_network_queue() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:59 -07:00
navin patidar
ebe98c4fc1 staging: rtl8188eu: Remove unused function rtw_get_timestampe_from_ie() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:23 -07:00
navin patidar
5f3f2a2962 staging: rtl8188eu: Remove unused function _rtw_IOL_append_WW_cmd() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:23 -07:00
navin patidar
2b83940a2e staging: rtl8188eu: Remove unused function rtw_set_802_11_remove_wep() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:23 -07:00
navin patidar
e68029d4df staging: rtl8188eu: Remove unused function rtw_set_802_11_remove_key() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:23 -07:00
navin patidar
e2313dce40 staging: rtl8188eu: Remove unused function rtw_set_802_11_add_key() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:23 -07:00
navin patidar
56da23db87 staging: rtl8188eu: Remove unused function rtw_validate_ssid() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:23 -07:00
navin patidar
0306b4f5e7 staging: rtl8188eu: Remove unused function rtw_set_scan_mode() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:23 -07:00
navin patidar
fbb6705860 staging: rtl8188eu: Remove function rtw_set_channel_plan() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:23 -07:00
navin patidar
48c72e880f staging: rtl8188eu: Remove unused function rtw_use_tkipkey_handler() 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:28:23 -07:00
Malcolm Priestley
a83a85939b staging: vt6656: wcnd.c clean up comments 
Removing old functions and comments.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:22:35 -07:00
Malcolm Priestley
983b65fa8d staging: vt6656: wcmd remove unneeded headers 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:22:35 -07:00
Malcolm Priestley
68cc161ee5 staging: vt6656: rename vResetCommandTimer to vnt_reset_command_timer 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:22:34 -07:00
Malcolm Priestley
57981a65fb staging: vt6656: Drop u8 pointer and rename bScheduleCommand. 
Rename to vnt_schedule_command removing unused u8 pointer.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-07-13 12:22:34 -07:00