net/hyperv: Remove unnecessary kmap_atomic in netvsc driver

__get_free_pages() doesn't return HI memory, so the memory is always mapped.
kmap_atomic() is not necessary here. This patch removes the kmap_atomic()
calls and related code for locking and page manipulation.

Signed-off-by: Haiyang Zhang <[email protected]>
Signed-off-by: K. Y. Srinivasan <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging/rtl8192e: Register against lib80211

Convert rtllib from registering the crypt drivers against rtllib_crypt
and instead register the against lib80211. The crypto functions have
R- prepended (R-CCMP, R-TKIP, R-WEP) so they will not clash with the
lib80211 versions.

We cannot use the lib80211 crypt drivers since the rtl8192e has some
hardware support that is not handled by the lib80211 crypt drivers.

Signed-off-by: Sean MacLennan <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging/rtl8192e: Convert to lib80211_crypt_info

Convert rtllib to use lib80211_crypt_info.

Signed-off-by: Sean MacLennan <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops

Convert rtllib_crypt_data to lib80211_crypt_data and
rtllib_crypt_ops to lib80211_crypt_ops.

This is almost a 1:1 replacement, only extra_prefix_len and
extra_postfix_len changed.

Signed-off-by: Sean MacLennan <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging/rtl8192e: Add lib80211.h to rtllib.h

Add lib80211.h header file to rtllib.h and get it compiling.

Signed-off-by: Sean MacLennan <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging/mei: add watchdog device registration wrappers

add mei_watchdog_register/unregister wrappers for
cleaner  encapsulation

Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

drm/omap: GEM, deal with cache

Uncached/writecombine buffers need to be clean before creating uc/wc
userspace mappings, lest dirty cache lines fall down and corrupt the
contents of the buffer.

Signed-off-by: Rob Clark <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: vt6656: int.c, int.h: Change return of function to void

This patch removes the int return of function INTnsProcessData, because
nobody uses this return.

Signed-off-by: Marcos Paulo de Souza <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: usbip: removed unused definitions from header

Removed remnants of old function definitions which have since been
removed in earlier cleanup work.

Signed-off-by: Bart Westgeest <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: usbip: removed dead code from receive function

The usbip_xmit function supported sending and receiving data, however
the sending part of the function was never used/executed. Renamed the
function to usbip_recv, and removed the unused code.

Signed-off-by: Bart Westgeest <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio: Drop {mark,unmark}_in_use callbacks

These callbacks are currently used by the individual buffer implementations to
ensure that the request_update callback is not issued while the buffer is in use.
But the core already provides sufficient measures to prevent this from happening
in the first place. So it is safe to remove them.

There is one functional change due to this patch. Since the buffer is no longer
marked as in use when the chrdev is opened, it is now possible to enable the
buffer while it is opened. This did not work before, because mark_param_change
did fail if the buffer was marked as in use.

Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio: Drop buffer mark_param_change callback

Right now we have a mark_param_change callback in the buffer access
functions struct, which should be called whenever the parameters (length,
bytes per datum) of the buffer change. But it is only called when the user
changes the buffer size, not when the bytes per datum change. Additionally each
buffer implementation already keeps track internally whether its parameters
have changed, making the call to mark_param_change after changing the buffer
length redundant. Since each buffer implementation knows best when one of its
parameters has changed just make tracking of this internal and drop the
mark_param_change callback.

Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio: Drop the unused buffer enable() and is_enabled() callbacks

Currently none of the buffer implementations implements the enable() or
is_enable() nor does core code try to call these. So it is safe to remove them.

Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio: Drop buffer busy flag

The flag is only cleared, never set or tested, so it is safe to remove it.

Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio: Make sure a device is only opened once at a time

Our buffer implementation does not support multiple concurrent readers. So we
have to ensure that a device is only opened once at a time. So do the same thing
we do for the event fd and introduce a per device busy flag. The flag gets set
when opening the device and gets cleared when closing the device. If a open is
attempted while the busy flag is set we return -EBUSY.

Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio: Disallow modifying buffer size when buffer is enabled

The buffer buffer storage is only update when enabling the buffer. Changing the
buffer size while the buffer is enabled will confuse the buffer in regard to
its actual buffer size and can cause potential memory corruption. Thus it is
only safe to modify the buffer size when the buffer is disabled.

Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio: Disallow changing scan elements in all buffered modes

Currently we only disallow changing the scan elements, while the buffer is
enabled, in triggered buffer mode. This patch changes it to disallow it for all
buffered modes. Disabling or enabling scan elements while the buffer is enabled
will cause undefined behavior since the reader will not be able to tell samples
with the new and old scan element set apart and thus wont be able to extract
any meaningful data from the buffer.

Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio: Use iio_buffer_enabled instead of open coding it

Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

drivers: staging: vt6656: card.c: Remove useless return statement

This patch removes the return of the function CARDbSetMediaChannel, that
always return TRUE value.

Signed-off-by: Marcos Paulo de Souza <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

drivers: staging: vt6656: Remove not used returned data of function

This function always return TRUE, and it is not used by the funtions
who calls it.

Signed-off-by: Marcos Paulo de Souza <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio: Remove unused variable

Fixes the following warning:
drivers/staging/iio/industrialio-buffer.c: In function ‘iio_scan_mask_query’:
drivers/staging/iio/industrialio-buffer.c:620: warning: unused variable ‘mask’

Signed-off-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: android: fixed 80 characters warnings in lowmemorykiller.c

This patch fixes some 80 chatacters limit warnings in the lowmemorykiller.c file

Signed-off-by: Marco Navarra <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: android: fixed a space warning in binder.h

This patch fixes a simple tab-space warning in binder.h found by checkpatch tool

Signed-off-by: Marco Navarra <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: gma500: Fix warning in power.c

 gma_resume_display() wants 'struct pci_dev *' as it's parameter, so lets pass dev->pdev instead of dev. Fixes the following warning.

drivers/staging/gma500/power.c: In function ‘gma_power_begin’:
drivers/staging/gma500/power.c:269:3: warning: passing argument 1 of ‘gma_resume_display’ from incompatible pointer type
drivers/staging/gma500/power.c:99:13: note: expected ‘struct pci_dev *’ but argument is of type ‘struct drm_device *’

Signed-off-by: Rakib Mullick <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: bcm: Fix an invalid dereference to a kmalloc in IOCTL_BCM_BULK_WRM

Variable IoBuffer.InputLength is chosen from userspace,
and can therefore be less than the intended size. In this
case,the memory from the kmalloc call is eventually cast
to a PBULKWRM_BUFFER. If the IoBuffer.InputLength does not
meet the minimum size of PBULKWRM_BUFFER, then we will get
a kernel Oops. To resolve this issue, this patch verifies
IoBuffer.InputLength meets the minimum size before invoking
the kmalloc call.

Signed-off-by: Kevin McKinney <[email protected]>
Reviewed-by: Dan Carpenter <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: bcm: Fix information leak in IOCTL_BCM_GET_DRIVER_VERSION

This ioctl, IOCTL_BCM_GET_DRIVER_VERSION, is
responsible for sending the driver version
to userspace. However, the requested size stored
in IoBuffer.OutputLength may be incorrect.
Therefore, we altered the code to send the
exact length of the version, plus one for the
null character.

Signed-off-by: Kevin McKinney <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: Remove LTTng from MAINTAINERS file

LTTng has been removed from the staging tree. Complete this removal by
removing the LTTng entry from the MAINTAINERS file.

Signed-off-by: Mathieu Desnoyers <[email protected]>
CC: Ingo Molnar <[email protected]>
CC: Peter Zijlstra <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

ashmem: Whitespace cleanups

Fixes checkpatch warnings with the ashmem.c file

CC: Brian Swetland <[email protected]>
CC: Colin Cross <[email protected]>
CC: Arve Hjønnevåg <[email protected]>
CC: Dima Zavin <[email protected]>
CC: Robert Love <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

ashmem: Fix arguments to ashmem_shrink

The arguments to shrink functions have changed, update
ashmem_shrink to match.

Signed-off-by: Colin Cross <[email protected]>
[jstultz: tweaked commit subject]
CC: Brian Swetland <[email protected]>
CC: Colin Cross <[email protected]>
CC: Arve Hjønnevåg <[email protected]>
CC: Dima Zavin <[email protected]>
CC: Robert Love <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

ashmem: Support lseek(2) in ashmem driver

Signed-off-by: Bjorn Bringert <[email protected]>
[jstultz: tweaked commit subject]
CC: Brian Swetland <[email protected]>
CC: Colin Cross <[email protected]>
CC: Arve Hjønnevåg <[email protected]>
CC: Dima Zavin <[email protected]>
CC: Robert Love <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

ashmem: Update arguments of shrinker for 2.6.35

Signed-off-by: Colin Cross <[email protected]>
CC: Brian Swetland <[email protected]>
CC: Colin Cross <[email protected]>
CC: Arve Hjønnevåg <[email protected]>
CC: Dima Zavin <[email protected]>
CC: Robert Love <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

ashmem: Fix ASHMEM_SET_PROT_MASK.

Signed-off-by: Arve Hjønnevåg <[email protected]>
CC: Brian Swetland <[email protected]>
CC: Colin Cross <[email protected]>
CC: Arve Hjønnevåg <[email protected]>
CC: Dima Zavin <[email protected]>
CC: Robert Love <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

ashmem: Implement read(2) in ashmem driver

Signed-off-by: Bjorn Bringert <[email protected]>
[jstultz: Tweaked commit subject]
CC: Brian Swetland <[email protected]>
CC: Colin Cross <[email protected]>
CC: Arve Hjønnevåg <[email protected]>
CC: Dima Zavin <[email protected]>
CC: Robert Love <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

ashmem: Anonymous shared memory subsystem

The anonymous shared memory (ashmem) subsystem provides a
Unix-y,file-based shared memory interface to user-space. It
works like anonymous memory (e.g. mmapping fd=0) except if
you share the file descriptor via the usual means, you will
share the mapping. The shared memory can be accessed via both
mmap or file I/O. The backing store is a simple shmem file.

Additionally, ashmem introduces the concept of page pinning.
Pinned pages (the default) behave like any anonymous memory.
Unpinned pages are available to the kernel for eviction during
VM pressure. When repinning the pages, the return value
instructs user-space as to any eviction. In this manner,
user-space processes may implement caching and similar
resource management that efficiently integrates with kernel
memory management.

Signed-off-by: Robert Love <[email protected]>
ashmem: Don't install fault handler for private mmaps.

Ashmem is used to create named private heaps. If this heap is backed
by a tmpfs file it will allocate two pages for every page touched.
In 2.6.27, the extra page would later be freed, but 2.6.29 does not
scan anonymous pages when running without swap so the memory is not
freed while the file is referenced. This change changes the behavior
of private ashmem mmaps to match /dev/zero instead tmpfs.

Signed-off-by: Arve Hjønnevåg <[email protected]>
ashmem: Add common prefix to name reported in /proc/pid/maps

Signed-off-by: Arve Hjønnevåg <[email protected]>
ashmem: don't require a page aligned size

This makes ashmem more similar to shmem and mmap, by
not requiring the specified size to be page aligned,
instead rounding it internally as needed.

Signed-off-by: Marco Nelissen <[email protected]>
[jstultz: Improved commit subject and included patch description
from rlove. Also moved ashmem files to staging dir, and reworked
code to avoid touching mm/shmem.c while we're in staging.]
CC: Brian Swetland <[email protected]>
CC: Colin Cross <[email protected]>
CC: Arve Hjønnevåg <[email protected]>
CC: Dima Zavin <[email protected]>
CC: Robert Love <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: android: add pmem driver

This adds the Android pmem driver to the staging tree.

[At this point in time, it is dependent on the ARM platform, due to some
build issues that require it. - gregkh]

Signed-off-by: Rebecca Schultz <[email protected]>
Signed-off-by: Rebecca Schultz Zavin <[email protected]>
Signed-off-by: Dima Zavin <[email protected]>
Signed-off-by: Jamie Gennis <[email protected]>
Cc: Brian Swetland <[email protected]>
Cc: Arve Hjønnevåg <[email protected]>
Cc: Colin Cross <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: android: switch: minor code formatting cleanups

This fixes a number of minor space issues in the Android switch code.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: android: switch: switch class and GPIO drivers.

This adds the Android switch driver code to the staging tree.

[Note, this code was located in drivers/switch/ in the Android kernel
releases, but as that api wasn't generally accepted, and the interface
is working toward changing to the newly proposed extcon inteface, this
driver was placed here until the extcon code is merged into mainline and
the Android userspace code is converted over to using it. - gregkh]

Signed-off-by: Arve Hjønnevåg <[email protected]>
Signed-off-by: Mike Lockwood <[email protected]>
Cc: MyungJoo Ham <[email protected]>
Cc: Kyungmin Park <[email protected]>
Cc: Donggeun Kim <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: MyungJoo Ham <[email protected]>
Cc: Linus Walleij <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
Cc: NeilBrown <[email protected]>
Cc: Morten CHRISTIANSEN <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: John Stultz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: drm/omap: add debugfs support

Right now just a tiler_map file to dump a 2d map of which areas in
tiler/dmm have pinned buffers (or reservations).  In the future more
could be added.

Signed-off-by: Rob Clark <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: drm/omap: avoid aquiring mutex in atomic context (v2)

omap_gem_roll() could be called by fbcon in atomic context or when
struct_mutext is held.  Avoid aquiring mutex (deadlock), or calling
tiler_pin() (which itself is not safe for atomic context) in these
cases.

Signed-off-by: Rob Clark <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: drm/omap: add ywrap module param

Can be set at boot or module load time to prevent YWRAP scrolling from
being enabled.

Signed-off-by: Rob Clark <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: fix build problem with staging/rtl8192e

The rtllib and rtllib_crypt drivers are both required for a fully
functional rtllib. Make sure both are always available by having
rtllib select rtllib_crypt.

Reported-by: Randy Dunlap <[email protected]>
Signed-off-by: Sean MacLennan <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio: iio_trigger contains defunct owner field. Remove it.

This field moved into the trigger_ops structure a while back, but somehow
never quite got cleared up.  This clears the last few drivers to set it
(nothing uses it) and gets rid of it entirely.

Signed-off-by: Jonathan Cameron <[email protected]>
Acked-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio: Make sure all triggers have a trigger_ops for the owner field.

The core needs the owner field to prevent module removal whilst in use and
uses it without confirming that the trigger_ops structure actually exists.

Signed-off-by: Jonathan Cameron <[email protected]>
Acked-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

iio: gyro: ADXRS450: Add support for ADXRS453 Digital Gyroscope

Signed-off-by: Michael Hennerich <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

iio: gyro: ADXRS450: Add missing read support for calibbias attribute

Signed-off-by: Michael Hennerich <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

iio: gyro: ADXRS450: Add missing scale attributes

Add missing scale attributes.
Temperature data is presented as 10-bit, twos complement number.
Therefore use singed and shift accordingly.

Signed-off-by: Michael Hennerich <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: comedi_fops.c whitespace fixes

Changed whitespaces in comedi/*.c to tabs where necessary. All .c
files within comedi now have no obvious style problems as reported by
checkpatch.pl

Signed-off-by: Florian Schmaus <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: crystalhd: bc_dts_defs.h: Fix up coding style

Fix comments style on structs and enums
Break long lines.

Signed-off-by: Jorgyano Vieira <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: android: fixed white spaces coding style issue in logger.c

This patch fixes some space-before-tabs warnings found by checkpatch tool on the staging android driver file logger.c

Signed-off-by: Marco Navarra <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in contec_pci_dio.c

This is a patch to the contec_pci_dio.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in das1800.c

This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printk to dev_<levels>.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in das1800.c

This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Included KERN_facility levels for printk.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in cb_pcidas64.c

This is a patch to the cb_pcidas64.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels> and Removed unnecessary
printk statements.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in cb_pcidas64.c

This is a patch to the cb_pcidas64.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels> and Removed unnecessary
printk statements.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in cb_pcidas.c

This is a patch to the cb_pcidas.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels>..

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in cb_pcidas.c

This is a patch to the cb_pcidas.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_dbg()..

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in das1800.c

This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in das1800.c

This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Coverted printks to dev_<levels>.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in daqboard2000.c

This is a patch to the daqboard2000.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in das1800.c

This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels>.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix brace coding style issue in ni_at_a2150.c

This is a patch to the ni_at_a2150.c file that fixes up a brace
warning found by the checkpatch.pl tool.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in jr3_pci.c

This is a patch to the jr3_pci.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels> and Removed unnecessary
printk statements.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in jr3_pci.c

This is a patch to the jr3_pci.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in daqboard2000.c

This is a patch to the daqboard2000.c file that fixes up a printk
warning found by the checkpatch.pl tool.

converted printks to dev_printk and Removed unnecessary
printk statements.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in daqboard2000.c

This is a patch to the daqboard2000.c file that fixes up a printk
warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in pcmuio.c

This is a patch to the pcmuio.c file that fixes up a printk
warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in pcmuio.c

This is a patch to the pcmuio.c file that fixes up a printk
warning found by the checkpatch.pl tool.

Converted printks to dev_functions.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in pcmuio.c

This is a patch to the pcmuio.c file that fixes up a printk
warning found by the checkpatch.pl tool.

Converted printks to dev_functions.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in dt3000.c

This is a patch to the dt3000.c file that fixes up a printk
warning found by the checkpatch.pl tool.

Converted printks to dev_<levels>.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in dt3000.c

This is a patch to the dt3000.c file that fixes up a printk
warning found by the checkpatch.pl tool.

Converted printks to dev_functions.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in dt3000.c

This is a patch to the dt3000.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels>.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in dt3000.c

This is a patch to the dt3000.c file that fixes up a printk
warning found by the checkpatch.pl tool.

Added KERN_facility levels.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in dt3000.c

This is a patch to the dt3000.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels>.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging/mei: code style - cleanup blanks

1. Remove redundant blanks
2. Straighten code lines that don't go over 80 characters

Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging/mei: remove outdated comment about setting iamthif_mtu

iamthif_mtu doesn't have default value anymore it
is always supplied by the ME firmware

Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: remove version.h includes in rtl8192e

Signed-off-by: Devendra Naga <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: comedi: fix printk issue in jr3_pci.c

This is a patch to the jr3_pci.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Added KERN_facility levels for printks.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: remove version.h includes in drivers/staging/rts5139

This was reported by "make versioncheck"

Signed-off-by: Devendra Naga <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging:iio:kfifo_buf: Fix potential buffer overflow in iio_read_first_n_kfifo

n is the number of bytes to read, not the number of samples. So if there is
enough data available we will write to the userspace buffer beyond its bounds.
Fix this by copying n bytes maximum. Also round n down to the next multiple of
the sample size, so we will only read complete samples. If the buffer is too
small to hold at least one sample return -EINVAL.

Also update the documentation of read_first_n to reflect the fact that 'n' is
supposed to be in bytes and not in samples.

Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: bcm: HandleControlPacket.c: breaking of long lines

Signed-off-by: Johannes Tenschert <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: bcm: HandleControlPacket.c: fix parens/braces

Signed-off-by: Johannes Tenschert <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: bcm: HandleControlPacket.c: fix comments

Signed-off-by: Johannes Tenschert <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: bcm: HandleControlPacket.c: fix indentation

Signed-off-by: Johannes Tenschert <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: bcm: HandleControlPacket.c: fix whitespaces

Signed-off-by: Johannes Tenschert <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: drm/omap: DMM based hardware scrolling console

Add support for YWRAP scrolling by shuffling pages around in DMM
instead of sw blits.

Note that fbcon only utilizes this mode if the y resolution is
divided evenly by the font height.  So, for example, a 1920x1080
display using a 16 pixel tall font will not utilize this, but a
1280x1024 display would.

Signed-off-by: Rob Clark <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: drm/omap: crtc/encoder/fb destroy cleanups

Signed-off-by: Rob Clark <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: drm/omap: allocation fail check

Signed-off-by: Rob Clark <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Staging: VME: PIO2: Add GPIOLIB dependancy

The PIO2 driver errors when GPIOLIB, on which it depends, is not enabled.

Add dependancy when selecting the PIO2.

Reported-by: Randy Dunlap <[email protected]>
Signed-off-by: Martyn Welch <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

MAINTAINERS: staging: tty: Update F: patterns

commit 51c9d654c2d ("Staging: delete tty drivers")
removed the files, delete the sections too.

CC: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Joe Perches <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

MAINTAINERS: staging: westbridge: Delete section

commit 78f23926dff9 ("Staging: delete westbridge code")
deleted the files, delete the section.

CC: David Cross <[email protected]>
CC: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Joe Perches <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

MAINTAINERS: brcm80211: Update F: pattern

commit fc2d6e573be
("staging: brcm80211: remove brcm80211 driver from the staging tree")
moved the files, update the F: pattern.

CC: John W. Linville <[email protected]>
CC: Arend van Spriel <[email protected]>
CC: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Joe Perches <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

MAINTAINERS: Delete generic_serial section

commit bb2a97e9ccd ("Staging: delete generic_serial drivers")
removed the files, delete the section.

CC: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Joe Perches <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

MAINTAINERS: update xgifb maintainer's e-mail address

All patches sent to the maintainer address bounce:

   Diagnostic-Code: smtp; 550 5.1.1 <[email protected]>: Recipient address
       rejected: User unknown in virtual mailbox table

The address found in drivers/staging/xgifb/TODO seems to work better.

Signed-off-by: Aaro Koskinen <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: line6: fixed ALSA/PCM interaction

The PCM subsystem in the Line6 driver is mainly used for PCM playback and
capture by ALSA, but also has other tasks, most notably providing a
low-latency software monitor for devices which don't support hardware
monitoring (e.g., the TonePort series). This patch makes ALSA "play nicely"
with the other components, i.e., prevents it from resetting the isochronous
USB transfer while other PCM tasks (software monitoring) are running.

Signed-off-by: Markus Grabner <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: line6: wait for urbs in snd_line6_prepare()

The .trigger() pcm callbacks are not allowed to block and cannot wait
until urbs have completed.  We need to ensure that stopping, preparing,
and then restarting a stream always works.

Currently the driver will sometimes return -EBUSY when restarting the
stream because urbs have not completed yet.  This can be triggered by
jackd from userspace.

The solution is to wait on urbs in the .prepare() pcm callback since
blocking is allowed in that callback.  This guarantees that all urbs are
quiesced and ready to be submitted when the start trigger callback is
invoked.

Signed-off-by: Stefan Hajnoczi <[email protected]>
Signed-off-by: Markus Grabner <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: line6: eliminate useless NULL checks

The line6 driver checks struct field addresses for NULL where it does
not make sense to do so.  The struct has already been checked for NULL
and there is no value in checking the first field's address too.

Suggested-by: Dan Carpenter <[email protected]>
Signed-off-by: Stefan Hajnoczi <[email protected]>
Signed-off-by: Markus Grabner <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: line6: eliminate useless index_out variable

Playback urbs use the index_out counter to decide which part of the
playback buffer to use.  Since the urb already has a unique index in
range [0, LINE6_ISO_BUFFERS) there is no need to keep a separate
counter.

Use the urb index instead.  This also eliminates the possibility of two
urbs using the same playback buffer space if they ever complete
out-of-order for some reason.

Signed-off-by: Stefan Hajnoczi <[email protected]>
Signed-off-by: Markus Grabner <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: line6: fix playback urb transfer buffer calculation

The playback urb transfer buffer calculation does not factor in
LINE6_ISO_PACKETS.  Buffer memory is organized like this in the driver:

  Buffer 0                 Buffer 1                 ...
  [Packet 0, Packet 1, ...][Packet 0, Packet 1, ...][Packet 0, ...]

However, we're lucky that LINE6_ISO_PACKETS is currently defined as 1 so
this patch does not change any behavior.  It's still worth including
this fix in case the LINE6_ISO_PACKETS value is changed in the future.

Signed-off-by: Stefan Hajnoczi <[email protected]>
Signed-off-by: Markus Grabner <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

staging: line6: fix memory leak in .hw_params()

The .hw_params() pcm callback can be invoked multiple times in a row.
Ensure that the URB data buffer is only allocated once.

Signed-off-by: Stefan Hajnoczi <[email protected]>
Signed-off-by: Markus Grabner <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Merge 3.2-rc5 into staging-next

This resolves the conflict in the
drivers/staging/iio/industrialio-core.c file due to two different
changes made to resolve the same problem.

Signed-off-by: Greg Kroah-Hartman <[email protected]>