Commit graph

435358 commits

Author SHA1 Message Date
Gulsah Kose
5f830a520a staging: winbond: Fix line over 80 characters.
Fix checkpatch.pl issues with line over 80 characters in localpara.h

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:27:39 -07:00
Ebru Akagunduz
07c452d4b9 Staging: cxt1e1: Fix externs should be avoided in .c files in comet.c
Fix checkpatch.pl issues with externs should be
avoided in comet.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:17:23 -07:00
Ebru Akagunduz
7184aa9dbe Staging: cxt1e1: Fix use of volatile is usually wrong in comet.c
Fix checkpatch.pl issues with use of volatile is
usually wrong in comet.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:17:23 -07:00
Gulsah Kose
0d89475861 staging: rtl8821ae: Fix braces {} are not necessary.
Fix checkpatch.pl issues with braces {} are not necessary in base.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:14:58 -07:00
Gulsah Kose
66d8a3938e staging: rtl8821ae: Fix suspect code indent for conditional statements
Fix checkpatch.pl issues with suspect code indent for conditional
statements (16, 16) in base.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:14:58 -07:00
Ebru Akagunduz
3df1d9bddf Staging: comedi: Fix line over 80 characters in s626.c
Fix checkpatch.pl issues line over 80 characters
in s626.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:14:22 -07:00
Ebru Akagunduz
fbdc4001e3 Staging: comedi: Fix missing space after return type in s626.c
Fix checkpatch.pl issues with missing space after
return type in s626.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:14:22 -07:00
Elena Oat
9cdddda572 Staging: rtl8188eu: Fix warning of braces are not necessary.
This patch fixes the warning of "braces are not necessary for single
statement blocks" in file rtw_ieee80211.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:13:37 -07:00
Elena Oat
5366f6f685 Staging: rtl8188eu: Fix warning of space prohibited.
This patch fixes the warning of "space prohibited before semicolon" in
file rtw_efuse.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:13:37 -07:00
Elena Oat
bd18b0abc8 Staging: rtl8188eu: Fix warning of braces not necessary.
This small patch fixes the warning of "braces are
necessary for any arm of this statement" in file rtw_efuse.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:13:37 -07:00
Elena Oat
c6f5fbcd55 Staging: rtl8188eu: Fix warnings of no space before tabs.
This patch fixes the warning of "please, no space before tabs" in file
rtw_efuse.c. I have also modified the style of the comments for
readability.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:10:26 -07:00
Elena Oat
2275d2b763 Staging: rtl8188eu: Fix warning of space prohibited.
This small patch fixes the warning of "space prohibited before
semicolon" in file rtw_debug.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:10:26 -07:00
Chi Pham
792f32ac64 staging: rtl8188eu: Reduced nesting and improved coding style.
Signed-off-by: Chi Pham <fempsci@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:10:26 -07:00
Linus Torvalds
ea1cd65a64 Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner:
 "A single bugfix: make the scheduler clock on Vybrid SoCs count
  forward"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: vf_pit_timer: use complement for sched_clock reading
2014-03-19 09:05:38 -07:00
Aybuke Ozdemir
3b77f472c3 staging:lustre:lnet: lib-types.h Fix open brace '{' err.
Fix checkpatch.pl issues with open brace '{' following
struct go on the same line in lib-types.h

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:04:30 -07:00
Aybuke Ozdemir
b11866b31b staging:lustre:lnet: lib-types.h Fix unnecessary space func. pointer name.
Fix checkpatch.pl issues with
unnecessary space after function pointer name in lib-types.h

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:04:30 -07:00
Georgiana Rodica Chelu
a95cdab3ce staging: lustre: add an extra line
Add an extra line break between the variable
declaration and the rest of the code

Signed-off-by: Georgiana Rodica Chelu <georgiana.chelu93@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:04:30 -07:00
James Hogan
36c9549460 MIPS: KVM: Remove dead code in CP0 emulation
The code to check whether rd > MIPS_CP0_DESAVE is dead code, since
MIPS_CP0_DESAVE = 31 and rd is already masked with 0x1f. Remove it.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sanjay Lal <sanjayl@kymasys.com>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-19 17:01:50 +01:00
Elena Oat
9137c9df5e Staging: rtl8188eu: Fix warnings of no space before tabs.
This patch fixes the warnings of "please, no space before tabs" in the
file rtw_mlme.c. I have also modified the comment style and removed some
unnecessary tabs.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:01:49 -07:00
Elena Oat
b4ed18b1df Staging: rtl8188eu: Fix warnings of space prohibited.
This patch fixes the warnings of "space prohibited between function name
and open parenthesis" in file rtw_mlme.c.

While at it, I have also removed unneccessary tabs. Also one comment
that didn't make sense was removed.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Acked-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:01:49 -07:00
Elena Oat
a318c9e0f4 Staging: rtl8188eu: Fix warning of braces {} are not necessary.
This patch fixes the warning of "braces {} are not necessary for single
statement blocks" in file rtw_mlme.c. I have removed the else statement
in one case, as it didn't have any value.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:01:49 -07:00
James Hogan
26f4f3b578 MIPS: KVM: Consult HWREna before emulating RDHWR
The ability to read hardware registers from userland with the RDHWR
instruction should depend upon the corresponding bit of the HWREna
register being set, otherwise a reserved instruction exception should be
generated.

However KVM's current emulation ignores the guest's HWREna and always
emulates RDHWR instructions even if the guest OS has disallowed them.

Therefore rework the RDHWR emulation code to check for privilege or the
corresponding bit in the guest HWREna bit. Also remove the #if 0 case
for the UserLocal register. I presume it was there for debug purposes
but it seems unnecessary now that the guest can control whether it
causes a guest exception.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sanjay Lal <sanjayl@kymasys.com>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-19 17:01:43 +01:00
James Hogan
1550567936 MIPS: KVM: Pass reserved instruction exceptions to guest
Previously a reserved instruction exception while in guest code would
cause a KVM internal error if kvm_mips_handle_ri() didn't recognise the
instruction (including a RDHWR from an unrecognised hardware register).

However the guest OS should really have the opportunity to catch the
exception so that it can take the appropriate actions such as sending a
SIGILL to the guest user process or emulating the instruction itself.

Therefore in these cases emulate a guest RI exception and only return
EMULATE_FAIL if that fails, being careful to revert the PC first in case
the exception occurred in a branch delay slot in which case the PC will
already point to the branch target.

Also turn the printk messages relating to these cases into kvm_debug
messages so that they aren't usually visible.

This allows crashme to run in the guest without killing the entire VM.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sanjay Lal <sanjayl@kymasys.com>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-19 17:01:34 +01:00
James Hogan
2202794548 MIPS: KVM: asm/kvm_host.h: Clean up whitespace
The whitespace in asm/kvm_host.h is quite inconsistent in places. Clean
up the whole file to use tabs more consistently.

When you use the --ignore-space-change argument to git diff this patch
only changes line wrapping in TLB_IS_GLOBAL and TLB_IS_VALID macros.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sanjay Lal <sanjayl@kymasys.com>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-19 17:01:15 +01:00
Malcolm Priestley
2033801522 staging: vt6656: s_uGetRTSCTSRsvTime fix return.
Always returns to __le16 type

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:19 -07:00
Malcolm Priestley
2075f6547e staging: vt6656: vnt_rxtx_rsvtime_le16 fix return.
Always returns to __le16 type.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:19 -07:00
Malcolm Priestley
5abe3d63ad staging: vt6656: s_uGetDataDuration use __le16.
s_uGetDataDuration always returns to __le16 type

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:19 -07:00
Malcolm Priestley
7f591a1107 staging: vt6656: Correct return type s_uGetRTSCTSDuration.
s_uGetRTSCTSDuration always returns in __le16 type

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:19 -07:00
Malcolm Priestley
c4cf6dfb8e staging: vt6656: rxtx endian correct return duration
All duration base types are __le16 correct back to cpu

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:19 -07:00
Malcolm Priestley
dab085b139 staging: vt6656: vnt_time_stamp_off fix return to __le16
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:19 -07:00
Malcolm Priestley
533f9d3adc staging: vt6656: struct vnt_tx_short_buf_head correct base types
Both variables duration and time_stamp_off are __le16 types

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:19 -07:00
Malcolm Priestley
10bb39a043 staging: vt6656: rxtx Replace wTimeStampOff* variables
Fix base type to __le16 and remove camel case.

Camel case changes
wTimeStampOff* -> time_stamp_off*

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:19 -07:00
Malcolm Priestley
372108e7b8 staging: vt6656: rxtx Replace wCTSTxRrvTime_ba
Replace with cts_rrv_time_ba with __le16 base.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:18 -07:00
Malcolm Priestley
7fd5747f31 staging: vt6656: rxtx: Replace wCTSDuration*
Fix base type to __le16 and remove camel case.

Camel case changes
wCTSDuration* -> cts_duration*

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:18 -07:00
Malcolm Priestley
5ff627aedb staging: vt6656: rxtx: Replace wTxRrvTime*
Fix base type to __le16 and remove camel case.

Camel case changes
wTxRrvTime* -> rrv_time*

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:18 -07:00
Malcolm Priestley
85417bf0d7 staging: vt6656: rxtx: Replace wRTSTxRrvTime*
Fix base type to __le16 and remove camel case.

Camel case changes
wRTSTxRrvTime* -> rts_rrv_time*

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:18 -07:00
Malcolm Priestley
fadc3bdfd9 staging: vt6656: rxtx: Replace wRTSDuration* variables
Fix base type to __le16 and remove camel case.

Camel case changes
wRTSDuration* -> rts_duration*

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:18 -07:00
Malcolm Priestley
4e01117c2d staging: vt6656: rxtx Replace wDuration* variables.
Fix base type to __le16 and remove camel case.

Camel case changes
wDuration* -> duration*

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:00:18 -07:00
Mark Hounschell
bbfbe832ff staging: dgap: re-factor some more code for 80+ lines
This patch fixes more 80+ char lines as reported by checkpatch

Signed-off-by: Mark Hounschell <markh@compro.net>
Tested-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 08:49:06 -07:00
Mark Hounschell
c43846a91f staging: dgap: get rid of DGAP_LOCK and DGAP_UNLOCK macros
This patch replaces the DGAP_LOCK and DGAP_UNLOCK macros with
spin_lock_irqsave spin_unlock_irqrestore.

Signed-off-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 08:49:06 -07:00
Mark Hounschell
8cdd76391e staging: dgap: re-factor some code for 80+ lines as reported by checkpatch
This patch re-factors some code to fix some 80+ lines as reported by checkpatch.
This patch was suggested and authored by Dan Carpenter. A test case for this
patch has been written and used to show the patch to be correct.

Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Hounschell <markh@compro.net>
Tested-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 08:49:06 -07:00
Mathieu Maret
d658f90f48 staging: wlags49_h2: Correct comment style in wl_netdev.c
Code is using C99 code style, so change them to kernel style

Signed-off-by: Mathieu Maret <mathieu.maret@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 08:34:48 -07:00
Mathieu Maret
f1f8221efe staging: wlags49_h2: remove commented code in wl_netdev.c
Remove unused code under C99 comment style

Signed-off-by: Mathieu Maret <mathieu.maret@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 08:34:48 -07:00
Mathieu Maret
fed3ffd8f7 staging: wlags49_h2: reindent wl_netdev.c
As the file is using a mix between space and tab,
and space instead of tab, use Lindent to fix the file

Signed-off-by: Mathieu Maret <mathieu.maret@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 08:34:14 -07:00
Grant Likely
ca3992bc0c Merge branch 'devicetree/next-reserved-mem' into devicetree/next 2014-03-19 15:01:53 +00:00
Pantelis Antoniou
0829f6d1f6 of: device_node kobject lifecycle fixes
After the move to having device nodes be proper kobjects the lifecycle
of the node needs to be controlled better.

At first convert of_add_node() in the unflattened functions to
of_init_node() which initializes the kobject so that of_node_get/put
work correctly even before of_init is called.

Afterwards introduce of_node_is_initialized & of_node_is_attached that
query the underlying kobject about the state (attached means kobj
is visible in sysfs)

Using that make sure the lifecycle of the tree is correct at all
times.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
[grant.likely: moved of_node_init() calls, fixed up locking, and
               dropped __of_populate() hunks]
Signed-off-by: Grant Likely <grant.likely@linaro.org>
2014-03-19 14:58:40 +00:00
Charles Keepax
749d32237b ALSA: compress: Pass through return value of open ops callback
The snd_compr_open function would always return 0 even if the compressed
ops open function failed, obviously this is incorrect. Looks like this
was introduced by a small typo in:

commit a0830dbd4e
ALSA: Add a reference counter to card instance

This patch returns the value from the compressed op as it should.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2014-03-19 15:46:24 +01:00
Sachin Kamat
991acaf629 regulator: s2mps11: Add missing of_node_put
Add of_node_put to decrement the ref count.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-03-19 13:11:07 +00:00
Sachin Kamat
14256f734e regulator: s2mps11: Use of_get_child_by_name
of_find_node_by_name walks the allnodes list, and can thus walk
outside of the parent node. Use of_get_child_by_name instead.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-03-19 13:11:07 +00:00
Viresh Kumar
0b443ead71 cpufreq: remove unused notifier: CPUFREQ_{SUSPENDCHANGE|RESUMECHANGE}
Two cpufreq notifiers CPUFREQ_RESUMECHANGE and CPUFREQ_SUSPENDCHANGE have
not been used for some time, so remove them to clean up code a bit.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
[rjw: Changelog]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2014-03-19 14:10:24 +01:00