10 Jan, 2012
1 commit
-
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)
net/hyperv: Add support for jumbo frame up to 64KB
net/hyperv: Add NETVSP protocol version negotiation
net/hyperv: Remove unnecessary kmap_atomic in netvsc driver
staging/rtl8192e: Register against lib80211
staging/rtl8192e: Convert to lib80211_crypt_info
staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops
staging/rtl8192e: Add lib80211.h to rtllib.h
staging/mei: add watchdog device registration wrappers
drm/omap: GEM, deal with cache
staging: vt6656: int.c, int.h: Change return of function to void
staging: usbip: removed unused definitions from header
staging: usbip: removed dead code from receive function
staging:iio: Drop {mark,unmark}_in_use callbacks
staging:iio: Drop buffer mark_param_change callback
staging:iio: Drop the unused buffer enable() and is_enabled() callbacks
staging:iio: Drop buffer busy flag
staging:iio: Make sure a device is only opened once at a time
staging:iio: Disallow modifying buffer size when buffer is enabled
staging:iio: Disallow changing scan elements in all buffered modes
staging:iio: Use iio_buffer_enabled instead of open coding it
...Fix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of
module_init due to using module_i2c_driver() helper, next to removal of
MODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).
09 Jan, 2012
2 commits
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
Kconfig: acpi: Fix typo in comment.
misc latin1 to utf8 conversions
devres: Fix a typo in devm_kfree comment
btrfs: free-space-cache.c: remove extra semicolon.
fat: Spelling s/obsolate/obsolete/g
SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
tools/power turbostat: update fields in manpage
mac80211: drop spelling fix
types.h: fix comment spelling for 'architectures'
typo fixes: aera -> area, exntension -> extension
devices.txt: Fix typo of 'VMware'.
sis900: Fix enum typo 'sis900_rx_bufer_status'
decompress_bunzip2: remove invalid vi modeline
treewide: Fix comment and string typo 'bufer'
hyper-v: Update MAINTAINERS
treewide: Fix typos in various parts of the kernel, and fix some comments.
clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
leds: Kconfig: Fix typo 'D2NET_V2'
sound: Kconfig: drop unknown symbol ARCH_CLPS7500
...Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones) -
* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)
reiserfs: Properly display mount options in /proc/mounts
vfs: prevent remount read-only if pending removes
vfs: count unlinked inodes
vfs: protect remounting superblock read-only
vfs: keep list of mounts for each superblock
vfs: switch ->show_options() to struct dentry *
vfs: switch ->show_path() to struct dentry *
vfs: switch ->show_devname() to struct dentry *
vfs: switch ->show_stats to struct dentry *
switch security_path_chmod() to struct path *
vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb
vfs: trim includes a bit
switch mnt_namespace ->root to struct mount
vfs: take /proc/*/mounts and friends to fs/proc_namespace.c
vfs: opencode mntget() mnt_set_mountpoint()
vfs: spread struct mount - remaining argument of next_mnt()
vfs: move fsnotify junk to struct mount
vfs: move mnt_devname
vfs: move mnt_list to struct mount
vfs: switch pnode.h macros to struct mount *
...
07 Jan, 2012
1 commit
-
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.The microcode_core.c patch was provided by Stephen Rothwell
who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.Signed-off-by: Greg Kroah-Hartman
04 Jan, 2012
1 commit
-
Signed-off-by: Al Viro
23 Dec, 2011
9 commits
-
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
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
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
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
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
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
The flag is only cleared, never set or tested, so it is safe to remove it.
Acked-by: Jonathan Cameron
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
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
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
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
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
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
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
Acked-by: Jonathan Cameron
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
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
Signed-off-by: Greg Kroah-Hartman
17 Dec, 2011
5 commits
-
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
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
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
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Michael Hennerich
Acked-by: Jonathan Cameron
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Michael Hennerich
Acked-by: Jonathan Cameron
Signed-off-by: Greg Kroah-Hartman -
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
Acked-by: Jonathan Cameron
Signed-off-by: Greg Kroah-Hartman
13 Dec, 2011
1 commit
-
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
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman
10 Dec, 2011
2 commits
-
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
-
The ad5790 has a binary compatible interface to ad5791, so we just have to add
an entry to the drivers device table to add support for it.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman
09 Dec, 2011
18 commits
-
When updating the scan mask we have to check the actual scan mask for if the
channel is already enabled, not the matching scan mask from the available
scan masks. The bit will already be set there and as a result the actual
scan mask will not get updated and the channel stays disabled.Also fix the return value of iio_scan_el_store which would return 1 instead of
the number of bytes written if the channel was already active in the scan mask.Acked-by: Jonathan Cameron
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
The sw_ring does not properly handle the case where the write pointer already
has wrapped around, the read pointer has not and the remaining buffer space at
the end is enough to fill the read buffer:+-----------------------------------+
| | |##data##| |
+-----------------------------------+
write_p read_pIn this case the current code will copy all available data to the buffer and
as a result will write beyond the bounds of the buffer and cause a memory
corruption.To address this issue this patch adds code to calculate the available buffer
space and makes sure that the number of bytes to copy does not exceed this
number. This allows the code which copies the data around to be simplified as
it only has to consider two cases: Read wraps around and read does not wrap
around.Signed-off-by: Lars-Peter Clausen
Acked-by: Jonathan Cameron
Signed-off-by: Greg Kroah-Hartman -
Fix a small typo in the iio_modifer enum.
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
These docs have lagged recent developments.
Signed-off-by: Jonathan Cameron
Signed-off-by: Greg Kroah-Hartman -
In all existing cases, the calls are coming from a location where
the indio_dev is already available.Signed-off-by: Jonathan Cameron
Signed-off-by: Greg Kroah-Hartman -
Now buffers do not have a specific dev structure, this is garbage.
Signed-off-by: Jonathan Cameron
Signed-off-by: Greg Kroah-Hartman -
No longer needed now we don't allow sysfs acccess to buffer data.
Signed-off-by: Jonathan Cameron
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
No longer needed as we don't have drivers providing sysfs access
to buffered data.Signed-off-by: Jonathan Cameron
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
No known use case and makes in kernel interface work more complex.
Signed-off-by: Jonathan Cameron
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
No known use case and makes in kernel interface work more complex.
Signed-off-by: Jonathan Cameron
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
No known use case and complicates in kernel interface work.
Signed-off-by: Jonathan Cameron
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
No known usecase and makes in kernel interface work more complex.
Signed-off-by: Jonathan Cameron
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
No known use case and complicates in kernel interface work.
Signed-off-by: Jonathan Cameron
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
No known use case and complicates in kernel interface work.
Signed-off-by: Jonathan Cameron
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
No known use case and complicates in kernel interface work.
Signed-off-by: Jonathan Cameron
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman -
No known use case and complicates in kernel interface work.
Signed-off-by: Jonathan Cameron
Acked-by: Lars-Peter Clausen
Signed-off-by: Greg Kroah-Hartman