GitHub/exynos8895/android_kernel_samsung_universal8895.git
9 years agostaging: octeon-usb: use __BITFIELD_FIELD
Aaro Koskinen [Sun, 22 Mar 2015 15:37:50 +0000 (17:37 +0200)]
staging: octeon-usb: use __BITFIELD_FIELD

Use __BITFIELD_FIELD to define bitfields. OCTEON can at least in theory
run also in little-endian mode, so the bitfield definitions should not
assume big-endian byte order.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: octeon-usb: delete redundant field from octeon_temp_buffer
Aaro Koskinen [Sun, 22 Mar 2015 15:37:49 +0000 (17:37 +0200)]
staging: octeon-usb: delete redundant field from octeon_temp_buffer

Since we are not moving/realigning the original pointer returned
by kmalloc, we don't need to store the value in a separate field.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: octeon-usb: remove useless prefix from pipe flags
Aaro Koskinen [Sun, 22 Mar 2015 15:37:48 +0000 (17:37 +0200)]
staging: octeon-usb: remove useless prefix from pipe flags

Remove useless prefix from pipe flags and adjust comments.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: octeon-usb: remove useless prefix from internal routines
Aaro Koskinen [Sun, 22 Mar 2015 15:37:47 +0000 (17:37 +0200)]
staging: octeon-usb: remove useless prefix from internal routines

Original CVMX code used "__" to distinguis internal USB functions
from public ones. But in Linux all cvmx_usb routines are internal
to this driver, so such separation is useless.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: octeon-usb: eliminate 64-bit register access wrappers
Aaro Koskinen [Sun, 22 Mar 2015 15:37:46 +0000 (17:37 +0200)]
staging: octeon-usb: eliminate 64-bit register access wrappers

Eliminate 64-bit register access wrappers. Since we don't implement
register-level debugging outputs, these are useless.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: octeon-usb: remove internal function parameter sanity checks
Aaro Koskinen [Sun, 22 Mar 2015 15:37:45 +0000 (17:37 +0200)]
staging: octeon-usb: remove internal function parameter sanity checks

Remove some function parameter sanity checks from internal functions
where we can rely them being called with sane parameters.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: rtl8192u: Remove function prototype from .c file
Cristina Opriceana [Sun, 22 Mar 2015 18:49:51 +0000 (20:49 +0200)]
Staging: rtl8192u: Remove function prototype from .c file

Remove function prototype from r8192U_core.c since it is
declared in the r8192U.h header and this is included in r8192U_core.c

Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: rtl8192u: Make function prototypes static
Cristina Opriceana [Sun, 22 Mar 2015 18:49:28 +0000 (20:49 +0200)]
Staging: rtl8192u: Make function prototypes static

Make functions static since they are used locally and no other files
refer them.

Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: media: remove useless dev_info to avoid null ptr dereference
Haneen Mohammed [Sun, 22 Mar 2015 00:02:02 +0000 (03:02 +0300)]
Staging: media: remove useless dev_info to avoid null ptr dereference

Context is used in dev_info after it has been freed.
This patch fix that issue by removing the dev_info itself,
for msg doesn't look much necessary.

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: rtl8723au: Remove unused function rtw_atimdone_event_callback23a
Somya Anand [Sun, 22 Mar 2015 09:19:29 +0000 (14:49 +0530)]
Staging: rtl8723au: Remove unused function rtw_atimdone_event_callback23a

This patch fixes the following sparse warning:

warning: symbol 'rtw_atimdone_event_callback23a' was not declared.
Should it be static?
rtw_atimdone_event_callback23a is local to the file rtw_mlme.c but
it isn't exposed in a header file anywhere. Moreover it is never called
from anywhere as well.

So, this patch removes this function completely.

Signed-off-by: Somya Anand <somyaanand214@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: wlan-ng: Remove typedef prism2sta_accesslist_t
Vatika Harlalka [Sat, 21 Mar 2015 06:57:34 +0000 (12:27 +0530)]
Staging: wlan-ng: Remove typedef prism2sta_accesslist_t

Remove typedef prism2sta_accesslist_t and replace its uses
in the code.
Signed-off-by: Vatika Harlalka <vatikaharlalka@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8723au: Do not byteswap timeout twice
Jes Sorensen [Sun, 22 Mar 2015 23:09:44 +0000 (19:09 -0400)]
staging: rtl8723au: Do not byteswap timeout twice

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8723au: update_txdesc(): bagg_pkt is always false
Jes Sorensen [Sun, 22 Mar 2015 23:09:43 +0000 (19:09 -0400)]
staging: rtl8723au: update_txdesc(): bagg_pkt is always false

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8723au: Fix trailing whitespace
Jes Sorensen [Sun, 22 Mar 2015 23:09:42 +0000 (19:09 -0400)]
staging: rtl8723au: Fix trailing whitespace

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8723au: Fix mis-placed break
Jes Sorensen [Mon, 23 Mar 2015 20:54:08 +0000 (16:54 -0400)]
staging: rtl8723au: Fix mis-placed break

In 7c3a8f2a5ec95e2b13704562f36321e20ddfc190 I made a mistake and moved
a break below a bracket, causing a situation where the for loop would
always exit when it shouldn't.

This patch corrects that mistake.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: wlan-ng: Remove typedef prism2sta_authlist_t
Vatika Harlalka [Sat, 21 Mar 2015 06:57:24 +0000 (12:27 +0530)]
Staging: wlan-ng: Remove typedef prism2sta_authlist_t

Remove typdef prism2sta_authlist_t and replace its uses
in the code.
Signed-off-by: Vatika Harlalka <vatikaharlalka@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: rtl8188eu: Delete space
Hatice ERTÜRK [Fri, 20 Mar 2015 19:25:20 +0000 (21:25 +0200)]
Staging: rtl8188eu: Delete space

Deleted spaces before ','.Because it is prohibited by the kernel coding style.
Error found with checkpatch.pl

Signed-off-by: Hatice ERTURK <haticeerturk27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: Fix indentation style by space
Helen Fornazier [Sat, 21 Mar 2015 02:18:10 +0000 (23:18 -0300)]
staging: fbtft: Fix indentation style by space

This patch fixes the checkpatch.pl warning and error:

WARNING: please, no spaces at the start of a line

ERROR: code indent should use tabs where possible

Signed-off-by: Helen Fornazier <helen.fornazier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: remove trailing white space
Helen Fornazier [Sat, 21 Mar 2015 16:50:05 +0000 (13:50 -0300)]
staging: fbtft: remove trailing white space

Clean useless trailing white spaces

Signed-off-by: Helen Fornazier <helen.fornazier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: iio: use the BIT macro in .h files
Haneen Mohammed [Sun, 22 Mar 2015 18:23:23 +0000 (21:23 +0300)]
Staging: iio: use the BIT macro in .h files

This patch replace bit shifting on 1, 2, and 3 with the BIT(x) macro.
Issue addressed by checkpatch.pl with --strict flag.

This was done with the help of Coccninelle:

@r1@
constant int g;
@@
(
0<<g
|
1<<g
|
2<<g
|
3<<g
)

@script:python b@
g2 <<r1.g;
y;
@@
coccinelle.y = int(g2) + 1

@c@
constant int r1.g;
identifier b.y;
@@
(
-(1 << g)
+BIT(g)
|
-(0 << g)
+ 0
|
-(2 << g)
+BIT(y)
|
-(3 << g)
+(BIT(y)| BIT(g))
)

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: iio: Fix file header to match standards
Cristina Opriceana [Sun, 22 Mar 2015 18:43:16 +0000 (20:43 +0200)]
Staging: iio: Fix file header to match standards

Fix file header to match Linux Kernel style. Remove Free Software
Foundation reference to silence the checkpatch.pl warning.
Add driver description and correct spelling mistakes.

Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: iio: Place driver in sleep mode on error
Cristina Opriceana [Sun, 22 Mar 2015 18:42:42 +0000 (20:42 +0200)]
Staging: iio: Place driver in sleep mode on error

Put device in sleep mode if an error is encountered after
initialization in order to avoid wasting power.

Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: iio: Add kernel-doc for struct hmc5843
Cristina Opriceana [Fri, 20 Mar 2015 16:09:43 +0000 (18:09 +0200)]
Staging: iio: Add kernel-doc for struct hmc5843

This patch documents the struct hmc5843 specific data following
this warning:
"CHECK: struct mutex definition without comment".

Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: lustre: Fix Sparse warnings for static declarations
Haneen Mohammed [Sat, 21 Mar 2015 07:51:42 +0000 (10:51 +0300)]
Staging: lustre: Fix Sparse warnings for static declarations

The following patch fixes Sparse warnings in genops.c regrding:
"Symbol * was not declared. Should it be static?"

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStagin: lustre: Fix externs should be avoided in .c
Haneen Mohammed [Sat, 21 Mar 2015 07:48:30 +0000 (10:48 +0300)]
Stagin: lustre: Fix externs should be avoided in .c

This patch moves extern declaration from genops.c to obd_class.h,
addressing checkpatch.pl warning: externs should be avoided in .c

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: lustre: Fix externs should be avoided in .c
Haneen Mohammed [Sat, 21 Mar 2015 07:47:56 +0000 (10:47 +0300)]
Staging: lustre: Fix externs should be avoided in .c

Thi patch moves extern declaration to "obd_class.h".
Remove prototype from "class_obd.c".
Issue addressed by checkpatch.pl.

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: lustre: remove extern in .c file
Haneen Mohammed [Sat, 21 Mar 2015 05:51:35 +0000 (08:51 +0300)]
Staging: lustre: remove extern in .c file

This patch removes extern from .c file; for the variable is not used
anywhere else in the file.
In addition, it mark it static in the one file it is in
"ldlm_resource.c".

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: lustre: Convert macro class_export_rpc_dec into static inline function
Somya Anand [Sat, 21 Mar 2015 12:50:25 +0000 (18:20 +0530)]
Staging: lustre: Convert macro class_export_rpc_dec into static inline function

This patch converts the macro class_export_rpc_dec into static inline
function. This is possible because the types of arguments at all the call
sites are same. So, the type of parameter is compatible with the types of
the arguments at all of the call sites.

Signed-off-by: Somya Anand <somyaanand214@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: lustre: Convert macro class_export_rpc_inc into static inline function
Somya Anand [Sat, 21 Mar 2015 12:50:24 +0000 (18:20 +0530)]
Staging: lustre: Convert macro class_export_rpc_inc into static inline function

This patch converts the macro class_export_rpc_inc into static inline
function. This is possible because the types of arguments at all the call
sites are same. So, the type of parameter is compatible with the types of
the arguments at all of the call sites.

Signed-off-by: Somya Anand <somyaanand214@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix parenthesis alignment in visorchipset_main.c
Benjamin Romer [Mon, 16 Mar 2015 17:58:52 +0000 (13:58 -0400)]
staging: unisys: fix parenthesis alignment in visorchipset_main.c

Fix as many parenthesis alignment problems in this file as possible.

In cases where there was no good way to align to the leading parenthesis, the
content of the parenthesis were aligned as if there were no limit, and then the
leading indentation was moved back to one tab in from the previous line.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: Fix CamelCase local variable in remaining_steps functions
Benjamin Romer [Mon, 16 Mar 2015 17:58:51 +0000 (13:58 -0400)]
staging: unisys: Fix CamelCase local variable in remaining_steps functions

Rename the CamelCase local variable

remainingSteps => remaining_steps

Update all references to use the corrected name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase local in textid functions
Benjamin Romer [Mon, 16 Mar 2015 17:58:50 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase local in textid functions

Fix the CamelCased local variable

textId => text_id

In both of the textid sysfs functions, and update all references to use the
corrected name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase variables in boottotool functions
Benjamin Romer [Mon, 16 Mar 2015 17:58:49 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase variables in boottotool functions

Rename the local CamelCase variable

efiSparIndication => efi_spar_indication

Update all references to use the corrected name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase local toolAction
Benjamin Romer [Mon, 16 Mar 2015 17:58:48 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase local toolAction

Rename the CamelCase local

toolAction => tool_action

In both of the sysfs functions for exposing this value, and update all
references to use the corrected name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase parameter in chipset functions
Benjamin Romer [Mon, 16 Mar 2015 17:58:47 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase parameter in chipset functions

Fix the CamelCase parameter

msgHdr => msg_hdr

In all of the chipset functions. Update all references to use the corrected
name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase parameter msgHdr in controlvm functions
Benjamin Romer [Mon, 16 Mar 2015 17:58:46 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase parameter msgHdr in controlvm functions

Fix the CamelCase parameter name

msgHdr => msg_hdr

In all of the controlvm functions in visorchipset_main.c. Update all references
to use the corrected name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase global Visorchipset_platform_device
Benjamin Romer [Mon, 16 Mar 2015 17:58:45 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase global Visorchipset_platform_device

Rename the CamelCase variable:

Visorchipset_platform_device => visorchipset_platform_device

Update all references to use the corrected name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCased global MajorDev
Benjamin Romer [Mon, 16 Mar 2015 17:58:44 +0000 (13:58 -0400)]
staging: unisys: fix CamelCased global MajorDev

Rename the CamelCase global:

MajorDev => major_dev

Update references to use the corrected name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase in responders functions
Benjamin Romer [Mon, 16 Mar 2015 17:58:43 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase in responders functions

Fix the CamelCase parameters:

busNo => bus_no
devNo => dev_no

In the functions bus_create_response(), bus_destroy_response(),
device_create_response(), device_destroy_response(), and
device_resume_response().

Fix the CamelCase global structure name

BusDev_Responders => busdev_responders

And update all references to use the corrected names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCased notifier globals
Benjamin Romer [Mon, 16 Mar 2015 17:58:42 +0000 (13:58 -0400)]
staging: unisys: fix CamelCased notifier globals

Fix these CamelCased names:

BusDev_Server_Notifiers => busdev_server_notifiers
BusDev_Client_Notifiers => busdev_client_notifiers

Update references to use the fixed names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCased Parahotplug globals
Benjamin Romer [Mon, 16 Mar 2015 17:58:41 +0000 (13:58 -0400)]
staging: unisys: fix CamelCased Parahotplug globals

Fix the CamelCase names:

Parahotplug_request_list => parahotplug_request_list
Parahotplug_request_list_lock => parahotplug_request_list_lock

Update references to use the corrected names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase global Visorchipset_cache_buffers_in_use
Benjamin Romer [Mon, 16 Mar 2015 17:58:40 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase global Visorchipset_cache_buffers_in_use

Rename this variable:

Visorchipset_cache_buffers_in_use => visorchipset_cache_buffers_in_use

Update all references to use the fixed name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase in putfile-related globals
Benjamin Romer [Mon, 16 Mar 2015 17:58:39 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase in putfile-related globals

Fix the CamelCase global names:

Putfile_buffer_list_pool => putfile_buffer_list_pool
Putfile_buffer_list_pool_name => putfile_buffer_list_pool_name
Putfile_request_list => putfile_request_list

Update all references to use the corrected names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCased ControlVM globals
Benjamin Romer [Mon, 16 Mar 2015 17:58:38 +0000 (13:58 -0400)]
staging: unisys: fix CamelCased ControlVM globals

Fix the CamelCase global names:

ControlVm_Pending_Msg => controlvm_pending_msg
ControlVm_Pending_Msg_Valid => controlvm_pending_msg_valid

Update all references to use the corrected names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: remove last remnants of proc entry code
Benjamin Romer [Mon, 16 Mar 2015 17:58:37 +0000 (13:58 -0400)]
staging: unisys: remove last remnants of proc entry code

All of the proc code using easyproc and procobjecttree support is gone,
so we can remove it from the source entirely.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix NULL pointer comparisons in uislib.c
Benjamin Romer [Mon, 16 Mar 2015 17:58:35 +0000 (13:58 -0400)]
staging: unisys: fix NULL pointer comparisons in uislib.c

Change pointer comparisons to NULL to just use the pointer directly.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase label in visorchipset_init()
Benjamin Romer [Mon, 16 Mar 2015 17:58:34 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase label in visorchipset_init()

Fix the CamelCase label:

Away => cleanup

Update all references to use the fixed name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase in setup_crash_devices_work_queue()
Benjamin Romer [Mon, 16 Mar 2015 17:58:33 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase in setup_crash_devices_work_queue()

Fix CamelCase names:

localCrashCreateBusMsg => local_crash_bus_msg
localCrashCreateDevMsg => local_crash_dev_msg
localSavedCrashMsgOffset => local_crash_msg_offset
localSavedCrashMsgCount => local_crash_msg_count
Away => cleanup

Update all references to use the fixed names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor controlvm_periodic_work()
Benjamin Romer [Mon, 16 Mar 2015 17:58:32 +0000 (13:58 -0400)]
staging: unisys: refactor controlvm_periodic_work()

Fix the CamelCase variable names:

gotACommand => got_command
Poll_Count => poll_count
Away => cleanup

Fix all references to use the new names. Remove the empty braces in the
while() and put in a trailing semicolon, for clarity.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor handle_command()
Benjamin Romer [Mon, 16 Mar 2015 17:58:31 +0000 (13:58 -0400)]
staging: unisys: refactor handle_command()

First, fix the CamelCase local variable names:

parametersAddr => parm_addr
parametersBytes => parm_bytes
isLocalAddr => local_addr

Change the type of local_addr to bool instead of using the #defined
type. Update all references to use the fixed names. Fix the indentation of that
line that's over the 80 column limit.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix spacing in parahotplug_request_create
Benjamin Romer [Mon, 16 Mar 2015 17:58:30 +0000 (13:58 -0400)]
staging: unisys: fix spacing in parahotplug_request_create

Just fix the spacing around the logical or operator in this function.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor parahotplug_process_list()
Benjamin Romer [Mon, 16 Mar 2015 17:58:29 +0000 (13:58 -0400)]
staging: unisys: refactor parahotplug_process_list()

Simplify the code a little and shorten the indentation levels by
reversing the check for time_after_eq().

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix Camelcase in initialize_controlvm_payload()
Benjamin Romer [Mon, 16 Mar 2015 17:58:28 +0000 (13:58 -0400)]
staging: unisys: fix Camelcase in initialize_controlvm_payload()

Fix the CamelCase local variables:

payloadOffset => payload_offset
payloadBytes => payload_bytes

Update all references to use the new names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix NULL comparison in destroy_controlvm_payload_info()
Benjamin Romer [Mon, 16 Mar 2015 17:58:27 +0000 (13:58 -0400)]
staging: unisys: fix NULL comparison in destroy_controlvm_payload_info()

Just remove the NULL from the check and test the pointer directly.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor initialize_controlvm_payload_info()
Benjamin Romer [Mon, 16 Mar 2015 17:58:26 +0000 (13:58 -0400)]
staging: unisys: refactor initialize_controlvm_payload_info()

Fix the CamelCased goto label:

Away => cleanup

and get rid of the NULL comparison.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor my_device_destroy()
Benjamin Romer [Mon, 16 Mar 2015 17:58:25 +0000 (13:58 -0400)]
staging: unisys: refactor my_device_destroy()

Fix the CamelCase variable names:

busNo => bus_no
devNo => dev_no
pDevInfo => dev_info

Update all the references to the updated names, then remove the goto and
its label.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor my_device_changestate()
Benjamin Romer [Mon, 16 Mar 2015 17:58:24 +0000 (13:58 -0400)]
staging: unisys: refactor my_device_changestate()

Fix the CamelCase names:

busNo => bus_no
devNo => dev_no
pDevInfo => dev_info

Update all references to use the new names, and remove the goto and
label entirely.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor my_device_create()
Benjamin Romer [Mon, 16 Mar 2015 17:58:23 +0000 (13:58 -0400)]
staging: unisys: refactor my_device_create()

Fix local CamelCase variable names:

busNo => bus_no
devNo => dev_no
pDevinfo => dev_info
pBusInfo => bus_info
Away => cleanup

Update references to use the corrected names, and change the kzalloc()
to use the variable itself rather than the type.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor bus_configure()
Benjamin Romer [Mon, 16 Mar 2015 17:58:22 +0000 (13:58 -0400)]
staging: unisys: refactor bus_configure()

First, fix the CamelCase names:

busNo => bus_no
pBusInfo => bus_info

Update all references to use the corrected names, and remove the messy
goto and label.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor bus_destroy()
Benjamin Romer [Mon, 16 Mar 2015 17:58:21 +0000 (13:58 -0400)]
staging: unisys: refactor bus_destroy()

Fix CamelCase names:

busNo => bus_no
pBusInfo => bus_info

Update all references to use the corrected names, and remove the goto
statements and labels entirely.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor bus_create()
Benjamin Romer [Mon, 16 Mar 2015 17:58:20 +0000 (13:58 -0400)]
staging: unisys: refactor bus_create()

First, fix all CamelCase names:

busNo => bus_no
pBusInfo => bus_info
Away => cleanup

Fix the kzalloc() call so it uses the variable name rather than the
type, and update all of the references to the renamed variables and
labels.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix braces in visorchipset_main.c
Benjamin Romer [Mon, 16 Mar 2015 17:58:19 +0000 (13:58 -0400)]
staging: unisys: fix braces in visorchipset_main.c

Fix all of the bracing mistakes by adding missing braces, and removing
unnecessary braces.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix spaces after typecasts in visorchipset_main.c
Benjamin Romer [Mon, 16 Mar 2015 17:58:18 +0000 (13:58 -0400)]
staging: unisys: fix spaces after typecasts in visorchipset_main.c

Just remove a couple of extra spaces after typecasts.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase in epilog functions
Benjamin Romer [Mon, 16 Mar 2015 17:58:17 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase in epilog functions

Rename the CamelCase parameters:

busNo => bus_no
devNo => dev_no
needResponse => need_response

And the local variables

pBusInfo => bus_info
pDevInfo => dev_info

Update all references to use the corrected names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase params in responder functions
Benjamin Romer [Mon, 16 Mar 2015 17:58:16 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase params in responder functions

Fix the CamelCase parameter names in the set of responder functions:

cmdId => cmd_id
busNo => bus_no
devNo => dev_no
responseState => response_state

Update all references to use the fixed names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase locals in visorchipset_save_message
Benjamin Romer [Mon, 16 Mar 2015 17:58:15 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase locals in visorchipset_save_message

Rename CamelCased local variable names:

localSavedCrashMsgOffset => crash_msg_offset
localSavedCrashMsgCount => crash_msg_count

Update references to use the new names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix Camelcase Away goto label
Benjamin Romer [Mon, 16 Mar 2015 17:58:14 +0000 (13:58 -0400)]
staging: unisys: fix Camelcase Away goto label

Rename the label in both places:

Away => cleanup

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix all NULL comparisons in visorchipset_main.c
Benjamin Romer [Mon, 16 Mar 2015 17:58:13 +0000 (13:58 -0400)]
staging: unisys: fix all NULL comparisons in visorchipset_main.c

Fix all of the NULL comparison checks generated by checkpatch.pl.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: remove obsolete proc entry code
Benjamin Romer [Mon, 16 Mar 2015 17:58:12 +0000 (13:58 -0400)]
staging: unisys: remove obsolete proc entry code

There is an unused variable in the visorchipset_bus_info structure that
used to be for a proc entry, so remove it, and the code that referenced
it. We don't need it anymore.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase-named clearing functions
Benjamin Romer [Mon, 16 Mar 2015 17:58:11 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase-named clearing functions

Fix the CamelCase-named structure clearing functions in
visorchipset_main.c:

busInfo_clear => bus_info_clear
devInfo_clear => dev_info_clear

Update references to use the fixed names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: remove old code block in visorchipset_main.c
Benjamin Romer [Mon, 16 Mar 2015 17:58:10 +0000 (13:58 -0400)]
staging: unisys: remove old code block in visorchipset_main.c

The block of code is old and #if 0'd out, so just remove it.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: remove extra blank lines in visorchipset_main.c
Benjamin Romer [Mon, 16 Mar 2015 17:58:09 +0000 (13:58 -0400)]
staging: unisys: remove extra blank lines in visorchipset_main.c

Fix up the line spacing around braces in visorchipset_main.c.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor livedump_info structure
Benjamin Romer [Mon, 16 Mar 2015 17:58:08 +0000 (13:58 -0400)]
staging: unisys: refactor livedump_info structure

Fix the CamelCase member names and that global variable:

Dumpcapture_header => dumpcapture_header
Gettextdump_header => gettextdump_header
Dumpcomplete_header => dumpcomplete_header
Gettextdump_outstanding => gettextdump_outstanding
LiveDump_info => livedump_info

Update all references and merge the definition and global structure
declaration.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase global ControlVm_payload_info
Benjamin Romer [Mon, 16 Mar 2015 17:58:07 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase global ControlVm_payload_info

Rename the CamelCase global structure

ControlVm_payload_info => controlvm_payload_info

Move the declaration to the struct definition, and update all references
to use the new name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: get rid of Test_Vnic_channel
Benjamin Romer [Mon, 16 Mar 2015 17:58:06 +0000 (13:58 -0400)]
staging: unisys: get rid of Test_Vnic_channel

Nobody is using this, so remove it.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase channel name ControlVm_channel
Benjamin Romer [Mon, 16 Mar 2015 17:58:05 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase channel name ControlVm_channel

Rename the channel:

ControlVm_channel => controlvm_channel

Update all references to use the new name. Fix the odd bracketing in the
while() statement with the reference to controlvm_channel, too, so the
patch doesn't generate a warning.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix placement of logical ops in visorchipset_main.c
Benjamin Romer [Mon, 16 Mar 2015 17:58:04 +0000 (13:58 -0400)]
staging: unisys: fix placement of logical ops in visorchipset_main.c

Several if statement lines had the logical operators in the wrong place,
so fix these by moving the operator to the end of the previous line.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase list names
Benjamin Romer [Mon, 16 Mar 2015 17:58:03 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase list names

Rename the CamelCased list names:

BusInfoList => bus_info_list
DevInfoList => dev_info_list

Update all references to use the fixed names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase name for devicechangestate packet
Benjamin Romer [Mon, 16 Mar 2015 17:58:02 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase name for devicechangestate packet

Fix the variable's CamelCase name:

g_DeviceChangeStatePacket => g_devicechangestate_packet

Update all references to use the fixed name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCased diagpool bus/dev names
Benjamin Romer [Mon, 16 Mar 2015 17:58:01 +0000 (13:58 -0400)]
staging: unisys: fix CamelCased diagpool bus/dev names

Fix CamelCase names:

g_diagpoolBusNo => g_diagpool_bus_no
g_diagpoolDevNo => g_diagpool_dev_no

Update all references to the changed names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase name
Benjamin Romer [Mon, 16 Mar 2015 17:58:00 +0000 (13:58 -0400)]
staging: unisys: fix CamelCase name

Fix CamelCase global variable:

UltraDiagPoolChannelProtocolGuid => spar_diag_pool_channel_protocol_uuid

Update all references to use the fixed name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase semaphore NotifierLock
Benjamin Romer [Mon, 16 Mar 2015 17:57:59 +0000 (13:57 -0400)]
staging: unisys: fix CamelCase semaphore NotifierLock

Rename the semaphore
NotifierLock => notifier_lock

Update all references to use the new name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase message header variables
Benjamin Romer [Mon, 16 Mar 2015 17:57:58 +0000 (13:57 -0400)]
staging: unisys: fix CamelCase message header variables

Fix the CamelCase variable names:

g_DiagMsgHdr => g_diag_msg_hdr
g_ChipSetMsgHdr => g_chipset_msg_hdr
g_DelDumpMsgHdr => g_del_dump_msg_hdr

Update all references to use the corrected names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase controlvm globals
Benjamin Romer [Mon, 16 Mar 2015 17:57:57 +0000 (13:57 -0400)]
staging: unisys: fix CamelCase controlvm globals

Fix the CamelCase variable names:
Periodic_controlvm_work => periodic_controlvm_work
Periodic_controlvm_workqueue => periodic_controlvm_workqueue

Update all references to use the corrected names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix CamelCase global Most_recent_message_jiffies
Benjamin Romer [Mon, 16 Mar 2015 17:57:56 +0000 (13:57 -0400)]
staging: unisys: fix CamelCase global Most_recent_message_jiffies

Fix the CamelCase global variable in visorchipset_main.c:
Most_recent_message_jiffies => most_recent_message_jiffies

Update all references to use the corrected name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor parser_byteStream_get
Benjamin Romer [Mon, 16 Mar 2015 17:57:55 +0000 (13:57 -0400)]
staging: unisys: refactor parser_byteStream_get

Fix this CamelCase function name:
parser_byteStream_get => parser_byte_stream_get

Update all references to use the fixed name. Fix the spacing in the typecast.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: refactor parser_init_byteStream
Benjamin Romer [Mon, 16 Mar 2015 17:57:54 +0000 (13:57 -0400)]
staging: unisys: refactor parser_init_byteStream

Fix CamelCase names:
parser_init_byteStream => parser_init_byte_stream
isLocal => local
tryAgain => retry

Update references to the changed function name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoMerge 4.0-rc5 into staging-testing
Greg Kroah-Hartman [Mon, 23 Mar 2015 20:36:48 +0000 (21:36 +0100)]
Merge 4.0-rc5 into staging-testing

We want the staging tree fixes that are upstream here as well to prevent
merge conflicts from people trying to clean up code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoLinux 4.0-rc5
Linus Torvalds [Sun, 22 Mar 2015 23:50:21 +0000 (16:50 -0700)]
Linux 4.0-rc5

9 years agoMerge tag 'md/4.0-rc4-fix' of git://neil.brown.name/md
Linus Torvalds [Sun, 22 Mar 2015 23:38:19 +0000 (16:38 -0700)]
Merge tag 'md/4.0-rc4-fix' of git://neil.brown.name/md

Pull bugfix for md from Neil Brown:
 "One fix for md in 4.0-rc4

  Regression in recent patch causes crash on error path"

* tag 'md/4.0-rc4-fix' of git://neil.brown.name/md:
  md: fix problems with freeing private data after ->run failure.

9 years agoMerge tag 'driver-core-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Sun, 22 Mar 2015 19:07:47 +0000 (12:07 -0700)]
Merge tag 'driver-core-4.0-rc5' of git://git./linux/kernel/git/gregkh/driver-core

Pull driver core fixes from Greg KH:
 "Here are two bugfixes for things reported.  One regression in kernfs,
  and another issue fixed in the LZ4 code that was fixed in the
  "upstream" codebase that solves a reported kernel crash

  Both have been in linux-next for a while"

* tag 'driver-core-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  LZ4 : fix the data abort issue
  kernfs: handle poll correctly on 'direct_read' files.

9 years agoMerge tag 'char-misc-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Linus Torvalds [Sun, 22 Mar 2015 19:03:14 +0000 (12:03 -0700)]
Merge tag 'char-misc-4.0-rc5' of git://git./linux/kernel/git/gregkh/char-misc

Pull char/misc fixes from Greg KH:
 "Here are three fixes for 4.0-rc5 that revert 3 PCMCIA patches that
  were merged in 4.0-rc1 that cause regressions.  So let's revert them
  for now and they will be reworked and resent sometime in the future.

  All have been tested in linux-next for a while"

* tag 'char-misc-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  Revert "pcmcia: add a new resource manager for non ISA systems"
  Revert "pcmcia: fix incorrect bracketing on a test"
  Revert "pcmcia: add missing include for new pci resource handler"

9 years agoMerge tag 'staging-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Linus Torvalds [Sun, 22 Mar 2015 18:59:02 +0000 (11:59 -0700)]
Merge tag 'staging-4.0-rc5' of git://git./linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
 "Here are four small staging driver fixes, all for the vt6656 and
  vt6655 drivers, that resolve some reported issues with them.

  All of these patches have been in linux next for a while"

* tag 'staging-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  vt6655: Fix late setting of byRFType.
  vt6655: RFbSetPower fix missing rate RATE_12M
  staging: vt6656: vnt_rf_setpower: fix missing rate RATE_12M
  staging: vt6655: vnt_tx_packet fix dma_idx selection.

9 years agoMerge tag 'tty-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Linus Torvalds [Sun, 22 Mar 2015 18:54:29 +0000 (11:54 -0700)]
Merge tag 'tty-4.0-rc5' of git://git./linux/kernel/git/gregkh/tty

Pull tty/serial driver fix from Greg KH:
 "Here's a single 8250 serial driver that fixes a reported deadlock with
  the serial console and the tty driver.

  It's been in linux-next for a while now"

* tag 'tty-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: 8250_dw: Fix deadlock in LCR workaround

9 years agoMerge tag 'usb-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Linus Torvalds [Sun, 22 Mar 2015 18:33:55 +0000 (11:33 -0700)]
Merge tag 'usb-4.0-rc5' of git://git./linux/kernel/git/gregkh/usb

Pull USB / PHY driver fixes from Greg KH:
 "Here's a number of USB and PHY driver fixes for 4.0-rc5.

  The largest thing here is a revert of a gadget function driver patch
  that removes 500 lines of code.  Other than that, it's a number of
  reported bugs fixes and new quirk/id entries.

  All have been in linux-next for a while"

* tag 'usb-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (33 commits)
  usb: common: otg-fsm: only signal connect after switching to peripheral
  uas: Add US_FL_NO_ATA_1X for Initio Corporation controllers / devices
  USB: ehci-atmel: rework clk handling
  MAINTAINERS: add entry for USB OTG FSM
  usb: chipidea: otg: add a_alt_hnp_support response for B device
  phy: omap-usb2: Fix missing clk_prepare call when using old dt name
  phy: ti/omap: Fix modalias
  phy: core: Fixup return value of phy_exit when !pm_runtime_enabled
  phy: miphy28lp: Convert to devm_kcalloc and fix wrong sizof
  phy: miphy365x: Convert to devm_kcalloc and fix wrong sizeof
  phy: twl4030-usb: Remove redundant assignment for twl->linkstat
  phy: exynos5-usbdrd: Fix off-by-one valid value checking for args->args[0]
  phy: Find the right match in devm_phy_destroy()
  phy: rockchip-usb: Fixup rockchip_usb_phy_power_on failure path
  phy: ti-pipe3: Simplify ti_pipe3_dpll_wait_lock implementation
  phy: samsung-usb2: Remove NULL terminating entry from phys array
  phy: hix5hd2-sata: Check return value of platform_get_resource
  phy: exynos-dp-video: Kill exynos_dp_video_phy_pwr_isol function
  Revert "usb: gadget: zero: Add support for interrupt EP"
  Revert "xhci: Clear the host side toggle manually when endpoint is 'soft reset'"
  ...

9 years agoMerge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Linus Torvalds [Sat, 21 Mar 2015 20:05:37 +0000 (13:05 -0700)]
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave dmaengine fixes from Vinod Koul:
 "Four fixes for dw, pl08x, imx-sdma and at_hdmac driver.  Nothing
  unusual here, simple fixes to these drivers"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: pl08x: Define capabilities for generic capabilities reporting
  dmaengine: dw: append MODULE_ALIAS for platform driver
  dmaengine: imx-sdma: switch to dynamic context mode after script loaded
  dmaengine: at_hdmac: Fix calculation of the residual bytes

9 years agoMerge tag 'pm+acpi-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
Linus Torvalds [Sat, 21 Mar 2015 19:51:36 +0000 (12:51 -0700)]
Merge tag 'pm+acpi-4.0-rc5' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management and ACPI fixes from Rafael Wysocki:
 "These are fixes for recent regressions (PCI/ACPI resources and at91
  RTC locking), a stable-candidate powercap RAPL driver fix and two ARM
  cpuidle fixes (one stable-candidate too).

  Specifics:

   - Revert a recent PCI commit related to IRQ resources management that
     introduced a regression for drivers attempting to bind to devices
     whose previous drivers did not balance pci_enable_device() and
     pci_disable_device() as expected (Rafael J Wysocki).

   - Fix a deadlock in at91_rtc_interrupt() introduced by a typo in a
     recent commit related to wakeup interrupt handling (Dan Carpenter).

   - Allow the power capping RAPL (Running-Average Power Limit) driver
     to use different energy units for domains within one CPU package
     which is necessary to handle Intel Haswell EP processors correctly
     (Jacob Pan).

   - Improve the cpuidle mvebu driver's handling of Armada XP SoCs by
     updating the target residency and exit latency numbers for those
     chips (Sebastien Rannou).

   - Prevent the cpuidle mvebu driver from calling cpu_pm_enter() twice
     in a row before cpu_pm_exit() is called on the same CPU which
     breaks the core's assumptions regarding the usage of those
     functions (Gregory Clement)"

* tag 'pm+acpi-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "x86/PCI: Refine the way to release PCI IRQ resources"
  rtc: at91rm9200: double locking bug in at91_rtc_interrupt()
  powercap / RAPL: handle domains with different energy units
  cpuidle: mvebu: Update cpuidle thresholds for Armada XP SOCs
  cpuidle: mvebu: Fix the CPU PM notifier usage

9 years agoMerge git://people.freedesktop.org/~airlied/linux
Linus Torvalds [Sat, 21 Mar 2015 19:41:50 +0000 (12:41 -0700)]
Merge git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "A bunch of fixes across drivers:

  radeon:
     disable two ended allocation for now, it breaks some stuff

  amdkfd:
     misc fixes

  nouveau:
     fix irq loop problem, add basic support for GM206 (new hw)

  i915:
     fix some WARNs people were seeing

  exynos:
     fix some iommu interactions causing boot failures"

* git://people.freedesktop.org/~airlied/linux:
  drm/radeon: drop ttm two ended allocation
  drm/exynos: fix the initialization order in FIMD
  drm/exynos: fix typo config name correctly.
  drm/exynos: Check for NULL dereference of crtc
  drm/exynos: IS_ERR() vs NULL bug
  drm/exynos: remove unused files
  drm/i915: Make sure the primary plane is enabled before reading out the fb state
  drm/nouveau/bios: fix i2c table parsing for dcb 4.1
  drm/nouveau/device/gm100: Basic GM206 bring up (as copy of GM204)
  drm/nouveau/device: post write to NV_PMC_BOOT_1 when flipping endian switch
  drm/nouveau/gr/gf100: fix some accidental or'ing of buffer addresses
  drm/nouveau/fifo/nv04: remove the loop from the interrupt handler
  drm/radeon: Changing number of compute pipe lines
  drm/amdkfd: Fix SDMA queue init. in non-HWS mode
  drm/amdkfd: destroy mqd when destroying kernel queue
  drm/i915: Ensure plane->state->fb stays in sync with plane->fb

9 years agoMerge tag 'devicetree-fixes-for-4.0-part2' of git://git.kernel.org/pub/scm/linux...
Linus Torvalds [Sat, 21 Mar 2015 19:33:01 +0000 (12:33 -0700)]
Merge tag 'devicetree-fixes-for-4.0-part2' of git://git./linux/kernel/git/robh/linux

Pull more DeviceTree fixes vfom Rob Herring:

 - revert setting stdout-path as preferred console.  This caused
   regressions in PowerMACs and other systems.

 - yet another fix for stdout-path option parsing.

 - fix error path handling in of_irq_parse_one

* tag 'devicetree-fixes-for-4.0-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  Revert "of: Fix premature bootconsole disable with 'stdout-path'"
  of: handle both '/' and ':' in path strings
  of: unittest: Add option string test case with longer path
  of/irq: Fix of_irq_parse_one() returned error codes

9 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Linus Torvalds [Sat, 21 Mar 2015 18:24:38 +0000 (11:24 -0700)]
Merge git://git./linux/kernel/git/nab/target-pending

Pull SCSI target fixes from Nicholas Bellinger:
 "Here are current target-pending fixes for v4.0-rc5 code that have made
  their way into the queue over the last weeks.

  The fixes this round include:

   - Fix long-standing iser-target logout bug related to early
     conn_logout_comp completion, resulting in iscsi_conn use-after-tree
     OOpsen.  (Sagi + nab)

   - Fix long-standing tcm_fc bug in ft_invl_hw_context() failure
     handing for DDP hw offload.  (DanC)

   - Fix incorrect use of unprotected __transport_register_session() in
     tcm_qla2xxx + other single local se_node_acl fabrics.  (Bart)

   - Fix reference leak in target_submit_cmd() -> target_get_sess_cmd()
     for ack_kref=1 failure path.  (Bart)

   - Fix pSCSI backend ->get_device_type() statistics OOPs with
     un-configured device.  (Olaf + nab)

   - Fix virtual LUN=0 target_configure_device failure OOPs at modprobe
     time.  (Claudio + nab)

   - Fix FUA write false positive failure regression in v4.0-rc1 code.
     (Christophe Vu-Brugier + HCH)"

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: do not reject FUA CDBs when write cache is enabled but emulate_write_cache is 0
  target: Fix virtual LUN=0 target_configure_device failure OOPs
  target/pscsi: Fix NULL pointer dereference in get_device_type
  tcm_fc: missing curly braces in ft_invl_hw_context()
  target: Fix reference leak in target_get_sess_cmd() error path
  loop/usb/vhost-scsi/xen-scsiback: Fix use of __transport_register_session
  tcm_qla2xxx: Fix incorrect use of __transport_register_session
  iscsi-target: Avoid early conn_logout_comp for iser connections
  Revert "iscsi-target: Avoid IN_LOGOUT failure case for iser-target"
  target: Disallow changing of WRITE cache/FUA attrs after export