Joe Perches [Tue, 4 Nov 2014 00:25:43 +0000 (16:25 -0800)]
staging: ft1000: Whitespace neatening
Use normal kernel style, indentation and alignment.
git diff -w shows no difference
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rickard Strandqvist [Sun, 2 Nov 2014 22:12:04 +0000 (23:12 +0100)]
staging: comedi: drivers: comedi_bond.c: Remove unneeded #define
Remove unneeded #define. This was previously included in a patch set
two but patchset one was taken by mistake.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 19:04:36 +0000 (12:04 -0700)]
staging: comedi: ni_at_a2150: use sample manipulation helpers
Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 19:04:35 +0000 (12:04 -0700)]
staging: comedi: hwdrv_apci3120: use sample manipulation helpers
Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 19:04:34 +0000 (12:04 -0700)]
staging: comedi: adl_pci9111: use sample manipulation helpers
Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 19:04:33 +0000 (12:04 -0700)]
staging: comedi: adl_pci9118: use sample manipulation helpers
Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 19:04:32 +0000 (12:04 -0700)]
staging: comedi: adv_pci1710: use sample manipulation helpers
Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 19:04:31 +0000 (12:04 -0700)]
staging: comedi: das16: use sample manipulation helpers
Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 19:04:30 +0000 (12:04 -0700)]
staging: comedi: das1800: use sample manipulation helpers
Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 19:04:29 +0000 (12:04 -0700)]
staging: comedi: ni_mio_common: use sample manipulation helpers
Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 19:04:28 +0000 (12:04 -0700)]
staging: comedi: remove use of 'bytes_per_sample()'
This inline helper function has been replaced with comedi_bytes_per_sample().
The same commit (
bf33eb4b4f57) introduced a couple other related helper
functions a manipulate the sample size.
Use the new helper functions to remove the use of 'bytes_per_sample()' and
remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 16:49:32 +0000 (09:49 -0700)]
staging: comedi: amplc_pci230: remove private data 'ai_scan_pos'
This member of the private data is replicating what the comedi_async
'cur_chan' member is used for. Use that instead and remove the private
data member.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 16:49:31 +0000 (09:49 -0700)]
staging: comedi: drivers: move comedi_async 'cur_chan' tracking into the core
The commedi_async 'cur_chan' member is used to track the current position
in the chanlist for a scan. Currently only a couple comedi drivers use
this member.
For aeshtetics, move the 'cur_chan' tracking into the core for non-SDF_PACKED
subdevices. The 'cur_chan' will be updated after reading or writing samples
to the async buffer by comedi_inc_scan_progress(). All non-SDF_PACKED subdevices
will then automatiaclly track the 'cur_chan'.
Some of the drivers use the 'cur_chan' to detect the end of scan event when
counting scans. The COMEDI_CB_EOS event is automatically added by the core
when the end of scan is detected. The drivers just need to check if the
'cur_chan' is 0 to count the number of scans completed.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 31 Oct 2014 16:49:30 +0000 (09:49 -0700)]
staging: comedi: ni_mio_common: remove unused variable in ni_ao_fifo_load()
The local variable 'range' is set but never used. Remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Fri, 31 Oct 2014 14:32:27 +0000 (14:32 +0000)]
staging: comedi: icp_multi: correct insn_bits returned data for DO
For some unfathomable reason, the Comedi `insn_bits` handler for the
digital output subdevice (`icp_multi_insn_bits_do()`) writes the digital
output register and reads back the unrelated digital input register.
Read back the current state of the outputs (held in `s->state`) instead.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 30 Oct 2014 18:32:29 +0000 (11:32 -0700)]
staging: comedi: rtd520: remove private data 'chan_is_bipolar' member
Currently this driver uses a bitmap in the private data to keep track of
the unipolar/bipolar range for each channel. This is needed to determine
if the data needs to be munged for bipolar samples.
Remove this member from the private data and use the comedi core helper
function comedi_range_is_bipolar() to determine if the data needs to be
munged.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 30 Oct 2014 18:32:28 +0000 (11:32 -0700)]
staging: comedi: rtd520: fix ai_read_n() async->cur_chan use
This functions uses the async->cur_chan to determine if the current channel
is using a bipolar range and the sample needs to be munged. The cur_chan is
never incremented so all the samples are munged based on the fist channel
in the cmd->chanlist.
Bump the cur_chan after writing each sample. This fixes the code so that
the munging will be done correctly.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 30 Oct 2014 18:21:54 +0000 (11:21 -0700)]
staging: comedi: drivers do not need to reset the async->cur_chan
The comedi core calls comedi_buf_reset() before starting an async command
(*do_cmd) and after returning a subdevice to an idle state (*cancel).
The drivers do not need to reset the async->cur_chan in those functions.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 30 Oct 2014 18:19:36 +0000 (11:19 -0700)]
staging: comedi: drivers: digital output subdevices do not need SDF_READABLE
The SDF_READABLE flag is not necessary for digital output subdevices. For
consistency, remove this flag from the comedi drivers that set it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 30 Oct 2014 18:19:35 +0000 (11:19 -0700)]
staging: comedi: drivers: remove inappropriate SDF_* flags from subdevices
The SDF_GROUND, SDF_COMMON, SDF_DIFF, and SDF_OTHER flags are only useful
with the analog input and output subdevices.
Remove these flags from the other subdevice types in the comedi drivers.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 30 Oct 2014 18:19:34 +0000 (11:19 -0700)]
staging: comedi: drivers: replace SDF_WRITEABLE with SDF_WRITABLE
As indicated in the comedi.h uapi header, SDF_WRITEABLE was a spelling
error in the API, SDF_WRITABLE is prefered.
For aesthetics, replace all the SDF_WRITEABLE uses with SDF_WRITABLE.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Thu, 30 Oct 2014 12:42:32 +0000 (12:42 +0000)]
staging: comedi: check actual data direction for COMEDI_BUFINFO ioctl
`do_bufinfo_ioctl()` handled the `COMEDI_BUFINFO` ioctl. It is supposed
to update the read or write positions in the buffer depending on the
direction of data transfer set up by the asynchronous command.
Currently it checks the `SDF_CMD_READ` and `SDF_CMD_WRITE` subdevice
flags. That's fine for most subdevices - the ones that only support one
direction, but is incorrect for those subdevices that allow the command
to be set up in either direction. Since we now set the `CMDF_WRITE`
flag according to the data transfer direction of the current command
running on the subdevice, check that flag instead.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Thu, 30 Oct 2014 12:42:31 +0000 (12:42 +0000)]
staging: comedi: check command direction in poll() file operation
`comedi_poll()` handles the poll() file operation for comedi devices.
If no asynchronous command has been set up on the current "read"
subdevice, it sets the `POLLIN` and `POLLRDNORM` bits in the return
value to indicate that the read() file operation would not block as it
would return an error. Add a check so it also does that if the
asynchronous command has been set up in the "write" direction as that
also causes the read() file operation to return an error.
Similarly, if no asynchronous command has need set up on the current
"write" subdevice, it sets the `POLLOUT` and `POLLWRNORM` bits in the
return value to indicate that the write() file operation would not block
as it would return an error. Add a check so it also does that if the
asynchronous command has been set up in the "read" direction as that
also causes the write() file operation to return an error.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Thu, 30 Oct 2014 12:42:30 +0000 (12:42 +0000)]
staging: comedi: don't allow write() on async command set up for "read"
If a Comedi asynchronous command has been set up for data transfer in
the "read" direction on the current "write" subdevice (for those
subdevices that support both directions), don't allow the "write" file
operation as that would mess with the data in the comedi data buffer
that is written by the low-level comedi hardware driver.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Thu, 30 Oct 2014 12:42:29 +0000 (12:42 +0000)]
staging: comedi: don't allow read() on async command set up for "write"
If a Comedi asynchronous command has been set up for data transfer in
the "write" direction on the current "read" subdevice (for those
subdevices that support both directions), don't allow the "read" file
operation as that would mess with the data in the comedi data buffer
that is read by the low-level comedi hardware driver.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Thu, 30 Oct 2014 12:42:28 +0000 (12:42 +0000)]
staging: comedi: ni_mio_common: don't change CMDF_WRITE flag
There is no need for `ni_ai_cmdtest()` or `ni_ao_cmdtest()` to set the
`CMDF_WRITE` flag to the correct state as it has already been done by
the core comedi module.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Thu, 30 Oct 2014 12:42:27 +0000 (12:42 +0000)]
staging: comedi: me4000: don't clobber command flags
The low-level Comedi drivers shouldn't change the `flags` member of
`struct comedi_cmd` as the Comedi core also uses some of those flags.
They should just ignore the flags they don't understand.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Thu, 30 Oct 2014 12:42:26 +0000 (12:42 +0000)]
staging: comedi: maybe force CMDF_WRITE command flag
Most comedi subdevices that support asynchronous commands only support
data transfer in either the "read" or "write" direction, as indicated by
the `SDF_CMD_READ` and `SDF_CMD_WRITE` subdevice flags, although a few
support both directions on the same subdevice (though not
simultaneously). The `struct comedi_cmd` structure passed via ioctl
call to set up the command contains a `CMDF_WRITE` flag that can be used
to choose the direction if the subdevice supports both directions, but
the flag is optional if the subdevice only supports data transfer in one
direction.
If the subdevice only supports asynchronous data transfer in a sing
direction, set the `CMDF_WRITE` flag to the correct state so that Comedi
can make use of it later. In the case of the `COMEDI_CMDTEST` ioctl,
the updated flag will be written back to the `struct comedi_cmd` in
user-space. In the case of the `COMEDI_CMD` ioctl, the flag only gets
written back if an error is detected while testing the command, or if
the `CMDF_BOGUS` command flag is set. Since `__comedi_get_user_cmd()`
is called for both ioctls, that's a good place to set the flag.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Fri, 31 Oct 2014 01:20:37 +0000 (10:20 +0900)]
staging: dgap: re-arrange functions for removing forward declarations
Re-arrange the functions for removing forward declarations.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Tested-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:30 +0000 (21:41 +0200)]
stating: rtl8723au: Eliminate write-only struct xmit_priv->txirp_cnt
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tristan Lelong [Fri, 31 Oct 2014 23:31:31 +0000 (16:31 -0700)]
Staging: android: ion: fix typos in comments
s/comming/coming/ in drivers/staging/android/ion/ion.c
s/specfic/specific/ in drivers/staging/android/ion/ion.h
s/peformance/performance/ in drivers/staging/android/ion/ion_priv.h
Signed-off-by: Tristan Lelong <tristan@lelong.xyz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mariusz Gorski [Sat, 1 Nov 2014 10:52:11 +0000 (11:52 +0100)]
staging: panel: Remove outdated TODO task
Remove Lindent task from TODO file as it's obsolete.
Signed-off-by: Mariusz Gorski <marius.gorski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dan Carpenter [Fri, 31 Oct 2014 10:41:05 +0000 (13:41 +0300)]
staging: r8188eu: cleanups in rtw_android_set_block()
1) We can tighten up the code a little by returning directly and it
makes the code more future proof and easier to read.
2) "free" is a better name than "exit".
3) sizeof(priv_cmd) is shorter and more clear than sizeof(struct
android_wifi_priv_cmd).
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dan Carpenter [Fri, 31 Oct 2014 10:40:39 +0000 (13:40 +0300)]
staging: r8188eu: get a string from the user correctly
The original code had two bugs:
1) It didn't check if the string was zero length so it could oops when
it tried to dereference the ZERO_SIZE_PTR.
2) It didn't enforce that the string was NUL terminated.
It was also messy as pants.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Fabio Estevam [Wed, 8 Oct 2014 00:42:19 +0000 (21:42 -0300)]
imx-drm: imx-drm-core: Remove unneeded forward declaration
There is no need to forward declare 'struct imx_drm_crtc' because the
"imx-drm.h" header file already includes it.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Philipp Zabel [Mon, 3 Nov 2014 14:54:47 +0000 (15:54 +0100)]
imx-drm: parallel-display: Fix drm_panel support
Call drm_panel_enable/disable in reaction to encoder_commit
and encoder_disable callbacks.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Philipp Zabel [Thu, 9 Oct 2014 13:21:17 +0000 (15:21 +0200)]
imx-drm: currently only IPUv3 is supported, make it mandatory
As long as only IPUv3 is supported in imx-drm, hide the separate
DRM_IMX_IPUV3 option and make DRM_IMX depend on IMX_IPUV3_CORE.
Reported-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Philipp Zabel [Wed, 8 Oct 2014 15:19:15 +0000 (17:19 +0200)]
imx-drm: ipuv3-plane: fix plane updates for active planes
While the DMA channel is running, it is not allowed to change anything
but the inactive (double) buffer base address, so resizing a plane or
changing to a frame buffer with different pixel format is not possible.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Philipp Zabel [Wed, 8 Oct 2014 15:19:14 +0000 (17:19 +0200)]
imx-drm: ipuv3-plane: enable double buffering
This allows to update the buffer base address while the DMA
channel is running. It is needed to flip the frame buffer of
an active plane.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Philipp Zabel [Wed, 8 Oct 2014 15:19:13 +0000 (17:19 +0200)]
imx-drm: ipuv3-plane: move stride setting out of base setup
Setting the stride can only be done on inactive channels, while
the buffer base address can also be updated for running channels
using the hardware double buffering feature.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Philipp Zabel [Wed, 8 Oct 2014 15:19:12 +0000 (17:19 +0200)]
imx-drm: ipuv3-plane: allow local alpha in ipu_plane_mode_set()
For the overlay plane scanning out a framebuffer with an alpha component,
enable the DP local alpha feature on the partial plane.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 30 Oct 2014 18:10:50 +0000 (11:10 -0700)]
staging: comedi: comedi_buf: make comedi_buf_write_samples() add samples that fit
This function currently fails if the number of samples to add would
overflow the async buffer. Modify it to add the samples that fit so
at least some of the sample data is returned to the user.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vaishali Thakkar [Fri, 31 Oct 2014 18:09:14 +0000 (23:39 +0530)]
Staging: rtl8188eu: Use put_unaligned_le32
This patch introduces the use of function put_unaligned_le32.
This is done using Coccinelle and semantic patch used is as follows:
@@ identifier tmp; expression ptr; expression y,e; type T; @@
- tmp = cpu_to_le32(y);
<+... when != tmp
- memcpy(ptr, (T)&tmp, ...);
+ put_unaligned_le32(y,ptr);
...+>
? tmp = e
@@ type T; identifier tmp; @@
- T tmp;
...when != tmp
Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Sarah Khan [Fri, 31 Oct 2014 23:02:45 +0000 (04:32 +0530)]
staging: xgifb: Removed a definition which was not used in driver
This patch removes a definition that was not used in driver xgifb
Signed-off-by: Sarah Khan <sarahjmi07@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Somya Anand [Fri, 31 Oct 2014 13:00:32 +0000 (18:30 +0530)]
staging: android: logger: Add a TODO
A comment about a pre-existing bug data structure definition is added.
This bug was evidently introduced by Xiong Zhou in the patch
bd471258f2e09 ("staging: android: logger: use kuid_t instead of uid_t")
where the code was changed to hide a valid build warning instead of
solving the bug that was identified by it.
Signed-off-by: Somya Anand <somyaanand214@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Surya Seetharaman [Fri, 31 Oct 2014 12:24:12 +0000 (17:54 +0530)]
Staging: rtl8188eu: rtw_pwrctrl: removed space before semicolon.
WARNING: space prohibited before semicolon
Signed-off-by: Surya Seetharaman<suryaseetharaman.9@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Surya Seetharaman [Fri, 31 Oct 2014 12:09:54 +0000 (17:39 +0530)]
Staging: rtl8188eu: rtw_pwrctrl: removed a checkpatch warning.
WARNING: void function return statements are not generally useful
Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Surya Seetharaman [Fri, 31 Oct 2014 11:57:54 +0000 (17:27 +0530)]
Staging: rtl8188eu: rtw_pwrctrl: fixed checkpatch warning.
WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt
Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vaishali Thakkar [Fri, 31 Oct 2014 11:06:18 +0000 (16:36 +0530)]
Staging: rtl8192u: Use put_unaligned_le16
This patch introduces the use of function put_unaligned_le16.
This is done using Coccinelle and semantic patch used is as follows:
@@ identifier tmp; expression ptr; expression y,e; type T; @@
- tmp = cpu_to_le16(y);
<+... when != tmp
- memcpy(ptr, (T)&tmp, ...);
+ put_unaligned_le16(y,ptr);
...+>
? tmp = e
@@ type T; identifier tmp; @@
- T tmp;
...when != tmp
Here, unnecessory comment after change is removed too.
This patch also fixes sparse warnings in file ieeee80211_softmac.c.
Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vaishali Thakkar [Fri, 31 Oct 2014 03:11:42 +0000 (08:41 +0530)]
Staging: rtl8192e: Use put_unaligned_le16
This patch introduces the use of function put_unaligned_le16.
This is done using Coccinelle and semantic patch used is as follows:
@@ identifier tmp; expression ptr; expression y,e; type T; @@
- tmp = cpu_to_le16(y);
<+... when != tmp
- memcpy(ptr, (T)&tmp, ...);
+ put_unaligned_le16(y,ptr);
...+>
? tmp = e
@@ type T; identifier tmp; @@
- T tmp;
...when != tmp
Here, to be compatible with the change header file is added too.
Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Roberta Dobrescu [Thu, 30 Oct 2014 22:01:20 +0000 (00:01 +0200)]
staging: rtl8723au: Remove useless static functions
This patch removes the static functions bthci_CmdSetEventFilter,
bthci_CmdReadRSSI and bthci_CmdHostNumberOfCompletedPackets, since their
body only consists of 'return HCI_STATUS_SUCCESS'.
Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vaishali Thakkar [Fri, 31 Oct 2014 02:26:29 +0000 (07:56 +0530)]
Staging: lustre: Use put_unaligned_le64
This patch introduces the use of function put_unaligned_le64.
This is done using Coccinelle and semantic patch used is as follows:
@@ identifier tmp; expression ptr; expression y,e; type T; @@
- tmp = cpu_to_le64(y);
<+... when != tmp
- memcpy(ptr, (T)&tmp, ...);
+ put_unaligned_le64(y,ptr);
...+>
? tmp = e
@@ type T; identifier tmp; @@
- T tmp;
...when != tmp
Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tina Ruchandani [Fri, 31 Oct 2014 00:45:22 +0000 (17:45 -0700)]
Staging: lustre: lnet: Improve 'incarnation' stamp
ksock_net_t uses a __u64 quantity as an 'incarnation' timestamp. This is also
passed on in hello messages and used to detect if a reboot has occurred.
This 'incarnation' is obtained using do_gettimeofday.It is only used in equality
checks, so the absolute value does not matter.
This patch replaces do_gettimeofday with ktime_get_ns for the following reasons:
1. ktime_get_ns returns a __u64 which is safer than 'struct timeval'
which will overflow on 32-bit systems in year 2038 and beyond.
2. Reduced compute: ktime_get_ns is faster than the multiply/add
combination used in this function
Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dilek Uzulmez [Thu, 30 Oct 2014 21:20:46 +0000 (23:20 +0200)]
staging: rtl8188eu: Remove unnecessary else after return
This patch fixes checkpatch.pl warning in files of rtl8188eu
WARNING: else is not generally useful after a break or return
Signed-off-by: Dilek Uzulmez <dilekuzulmez@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ken Depro [Mon, 3 Nov 2014 19:56:32 +0000 (14:56 -0500)]
staging: unisys: Remove unneeded spaces from channel.c
This patch removes some unneeded white space after casts within the
channel.c file. The checkpatch script was run after these changes,
and no further checks or warnings were seen.
Signed-off-by: Ken Depro <kenneth.depro@unisys.com>
Signed-off-by: Ben Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:11 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase local variables in virtpci_device_add()
Rename the following local variables in virtpci_device_add()
pIoChan changed to io_chan
pDev changed to dev
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:10 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase local variables in fix_vbus_dev_info()
Rename the following local variables in fix_vbus_dev_info()
Change pChan to chan
Change devInfo to dev_info
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:09 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase parameters of fix_vbus_dev_info()
Rename the following fix_vbus_dev_info() parameters
devNo changed to dev_no
devType changed to dev_type
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:08 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase name fix_vbus_devInfo()
Rename fix_vbus_devInfo() to fix_vbus_dev_info().
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:07 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase in delete_vbus_device()
Rename pDev to dev in delete_vbus_device()
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:06 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase write_vbus_devInfo()
Rename write_vbus_devInfo() to write_vbus_dev_info() in virtpci.c
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:05 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase write_vbus_busInfo()
Rename write_vbus_busInfo() to write_vbus_bus_info() in virtpci.c
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:04 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase write_vbus_chpInfo()
Rename write_vbus_chpInfo() to write_vbus_chp_info() in virtpci.c
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:03 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase vbus driver info variable
Rename BusDriverInfo variable to bus_driver_info in virtpci.c
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:02 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase virtpci device list lock
Rename VpcidevListLock to vpcidev_list_lock in virtpci.c
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:01 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase virtpci device list head
Rename VpcidevListHead to vpcidev_list_head in virtpci.c
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bryan Thompson [Mon, 3 Nov 2014 19:21:00 +0000 (14:21 -0500)]
staging: unisys: virtpci: Fix CamelCase Chipset_DriverInfo
Rename Chipset_DriverInfo to chipset_driver_info in virtpci.c
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:43 +0000 (09:57 -0400)]
staging: unisys: remove unused macros from visorchipset.h
Delete the macros and related preprocessor code for DBG_GETFILE_PAYLOAD(),
DBG_GETFILE(), and DBG_PUTFILE().
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:42 +0000 (09:57 -0400)]
staging: unisys: remove visorchipset_controlvm_respond_reportEvent()
No one is using this definition so remove it.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:41 +0000 (09:57 -0400)]
staging: unisys: fix CamelCase in visorchipset_set_device_context()
Fix CamelCase parameter names:
busNo => bus_no
devNo => dev_no
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:40 +0000 (09:57 -0400)]
staging: unisys: fix CamelCase in visorchipset_set_bus_context()
Fix CamelCase parameter:
busNo => bus_no
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:39 +0000 (09:57 -0400)]
staging: unisys: remove unused definitions from visorchipset.h
Delete visorchipset_get_switch_info() and visorchipset_get_externalport_info()
as these functions were declared but not defined, or used.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:38 +0000 (09:57 -0400)]
staging: unisys: fix CamelCase in visorchipset_get_device_info()
Fix CamelCase names:
busNo => bus_no
devNo => dev_no
devInfo => dev_info
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:37 +0000 (09:57 -0400)]
staging: unisys: fix CamelCase in visorchipset_get_bus_info
Fix CamelCase names:
busNo => bus_no
busInfo => bus_info
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:36 +0000 (09:57 -0400)]
staging: unisys: fix CamelCase in visorchipset_device_pause_response()
Fix CamelCase parameters:
busNo => bus_no
devNo => dev_no
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:35 +0000 (09:57 -0400)]
staging: unisys: fix CamelCase name in visorchipset_register_busdev_server()
Fix CamelCase name:
driverInfo => driver_info
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:34 +0000 (09:57 -0400)]
staging: unisys: fix CamelCase name in visorchipset_register_busdev_client()
Fix CamelCase parameter:
driverInfo => driver_info
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:33 +0000 (09:57 -0400)]
staging: unisys: refactor VISORCHIPSET_BUSDEV_RESPONDERS
Get rid of the typedef and just use struct visorchipset_busdev_responders
instead. Fix CamelCase parameter names in the function pointer definitions for
the structure:
busNo => bus_no
devNo => dev_no
Update references to changed names.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:32 +0000 (09:57 -0400)]
staging: unisys: refactor VISORCHIPSET_BUSDEV_NOTIFIERS
Get rid of the typedef and just use struct visorchipset_busdev_notifiers
instead. Fix CamelCase names in parameters for the function pointers:
busNo => bus_no
devNo => dev_no
typeGuid => type_uuid
minSize => min_size
maxSize => max_size
Update references.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:31 +0000 (09:57 -0400)]
staging: unisys: refactor VISORCHIPSET_INTERNALPORT_INFO
Get rid of the typedef and use struct visorchipset_internalport_info and fix
CamelCase member names:
switchNo => switch_no
internalPortNo => internal_port_no
busNo => bus_no
devNo => dev_no
Reserved1 => reserved1
Reserved2 => reserved2
pendingMsgHdr => pending_msg_hdr
procObject => proc_object
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Benjamin Romer [Fri, 31 Oct 2014 13:57:30 +0000 (09:57 -0400)]
staging: unisys: refactor VISORCHIPSET_EXTERNALPORT_INFO
Remove the typedef and just use struct visorchipset_externalport_info instead.
Fix all CamelCase names:
switchNo => switch_no
externalPortNo => external_port_no
networkZoneGuid => network_zone_uuid
pdPort => pd_port
ipNetmask => ip_netmask
ipBroadcast => ip_broadcast
ipNetwork => ip_network
ipGateway => ip_gateway
ipDNS => ip_dns
Reserved1 => reserved1
Reserved2 => reserved2
pendingMsgHdr => pending_msg_hdr
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Benjamin Romer [Fri, 31 Oct 2014 13:57:29 +0000 (09:57 -0400)]
staging: unisys: refactor VISORCHIPSET_SWITCH_INFO
Remove the typedef and use struct visorchipset_switch_info instead. Fix all
CamelCase member names:
switchNo => switch_no
switchTypeGuid => switch_type_uuid
authService1 => authservice1
authService2 => authservice2
authService3 => authservice3
securityContext => security_context
Reserved => reserved
Reserved2 => reserved2
pendingMsgHdr => pending_msg_hdr
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Benjamin Romer [Fri, 31 Oct 2014 13:57:28 +0000 (09:57 -0400)]
staging: unisys: fix CamelCase in findbus()
Fix the CamelCase parameter name in findbus() in visorchipset.h.
busNo => bus_no
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:27 +0000 (09:57 -0400)]
staging: unisys: refactor VISORCHIPSET_BUS_INFO
Remove the typedef and use the name struct visorchipset_bus_info instead.
Fix CamelCase member names in the structure:
busNo => bus_no
chanInfo => chan_info
partitionGuid => partition_uuid
partitionHandle => partition_handle
Reserved1 => reserved1
Reserved2 => reserved2
procObject => proc_object
Update references to changed names.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:26 +0000 (09:57 -0400)]
staging: unisys: fix CamelCase parameters in delbusdevices()
Fix the CamelCase parameter in delbusdevices() in visorchipset.h:
busNo => bus_no
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:25 +0000 (09:57 -0400)]
staging: unisys: fix CamelCase parameters in finddevice()
Fix CamelCase names in finddevice():
busNo => bus_no
devNo => dev_no
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:24 +0000 (09:57 -0400)]
staging: unisys: refactor VISORCHIPSET_DEVICE_INFO
Remove the typedef and use struct visorchipset_device_info instead. Fix
CamelCase names:
busNo => bus_no
devNo => dev_no
devInstGuid => dev_inst_guid
chanInfo => chan_info
Reserved1 => reserved1
Reserved2 => reserved2
switchNo => switch_no
internalPortNo => internal_port_no
pendingMsgHdr => pending_msg_hdr
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:23 +0000 (09:57 -0400)]
staging: unisys: refactor VISORCHIPSET_CHANNEL_INFO
Remove the typedef from this type and use struct visorchipset_channel_info
instead. Fix CamelCase member names:
addrType => addr_type
channelAddr => channel_addr
nChannelBytes => n_channel_bytes
channelTypeGuid => channel_type_uuid
channelInstGuid => channel_inst_uuid
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:22 +0000 (09:57 -0400)]
staging: unisys: refactor CRASH_OBJ_TYPE
Remove the typedef from the enumeration and replace references to it with
enum crash_obj_type. Fix CamelCase names:
CRASH_dev => CRASH_DEV
CRASH_bus => CRASH_BUS
Update all references to changed names.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:21 +0000 (09:57 -0400)]
staging: unisys: refactor VISORCHIPSET_ADDRESSTYPE
Get rid of VISORCHIPSET_ADDRESSTYPE and replace it with enum
visorchipset_addresstype. Fix CamelCase names:
ADDRTYPE_localPhysical => ADDRTYPE_LOCALPHYSICAL
ADDRTYPE_localTest => ADDRTYPE_LOCALTEST
Update all references to changed names.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 31 Oct 2014 13:57:20 +0000 (09:57 -0400)]
staging: unisys: get rid of VISORCHIPSET_STATE typedef
Remove the typedef for VISORCHIPSET_STATE and replace it with enum
visorchipset_state.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Mon, 3 Nov 2014 02:06:03 +0000 (18:06 -0800)]
Merge 3.18-rc3 into staging-next
We want the upstream fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linus Torvalds [Sun, 2 Nov 2014 23:01:51 +0000 (15:01 -0800)]
Linux 3.18-rc3
Linus Torvalds [Sun, 2 Nov 2014 22:45:52 +0000 (14:45 -0800)]
Merge tag 'for-linus-
20141102' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
"Three main MTD fixes for 3.18:
- A regression from 3.16 which was noticed in 3.17. With the
restructuring of the m25p80.c driver and the SPI NOR library
framework, we omitted proper listing of the SPI device IDs. This
means m25p80.c wouldn't auto-load (modprobe) properly when built as
a module. For now, we duplicate the device IDs into both modules.
- The OMAP / ELM modules were depending on an implicit link ordering.
Use deferred probing so that the new link order (in 3.18-rc) can
still allow for successful probing.
- Fix suspend/resume support for LH28F640BF NOR flash"
* tag 'for-linus-
20141102' of git://git.infradead.org/linux-mtd:
mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF chips
mtd: omap: fix mtd devices not showing up
mtd: m25p80,spi-nor: Fix module aliases for m25p80
mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id
mtd: m25p80: get rid of spi_get_device_id
Linus Torvalds [Sun, 2 Nov 2014 22:39:35 +0000 (14:39 -0800)]
Merge tag 'scsi-for-linus' of git://git./linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is a set of six patches consisting of:
- two MAINTAINER updates
- two scsi-mq fixs for the old parallel interface (not every request
is tagged and we need to set the right flags to populate the SPI
tag message)
- a fix for a memory leak in scatterlist traversal caused by a
preallocation update in 3.17
- an ipv6 fix for cxgbi"
[ The scatterlist fix also came in separately through the block layer tree ]
* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
MAINTAINERS: ufs - remove self
MAINTAINERS: change hpsa and cciss maintainer
libcxgbi : support ipv6 address host_param
scsi: set REQ_QUEUE for the blk-mq case
Revert "block: all blk-mq requests are tagged"
lib/scatterlist: fix memory leak with scsi-mq
Linus Torvalds [Sun, 2 Nov 2014 22:27:30 +0000 (14:27 -0800)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Nothing too astounding or major: radeon, i915, vmwgfx, armada and
exynos.
Biggest ones:
- vmwgfx has one big locking regression fix
- i915 has come displayport fixes
- radeon has some stability and a memory alloc failure
- armada and exynos have some vblank fixes"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (24 commits)
drm/exynos: correct connector->dpms field before resuming
drm/exynos: enable vblank after DPMS on
drm/exynos: init kms poll at the end of initialization
drm/exynos: propagate plane initialization errors
drm/exynos: vidi: fix build warning
drm/exynos: remove explicit encoder/connector de-initialization
drm/exynos: init vblank with real number of crtcs
drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size.
drm/vmwgfx: Fix hash key computation
drm/vmwgfx: fix lock breakage
drm/i915/dp: only use training pattern 3 on platforms that support it
drm/radeon: remove some buggy dead code
drm/i915: Ignore VBT backlight check on Macbook 2, 1
drm/radeon: remove invalid pci id
drm/radeon: dpm fixes for asrock systems
radeon: clean up coding style differences in radeon_get_bios()
drm/radeon: Use drm_malloc_ab instead of kmalloc_array
drm/radeon/dpm: disable ulv support on SI
drm/i915: Fix GMBUSFREQ on vlv/chv
drm/i915: Ignore long hpds on eDP ports
...
Linus Torvalds [Sun, 2 Nov 2014 20:56:20 +0000 (12:56 -0800)]
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
- add the new bpf syscall to ARM.
- drop a redundant return statement in __iommu_alloc_remap()
- fix a performance issue noticed by Thomas Petazzoni with
kmap_atomic().
- fix an issue with the L2 cache OF parsing code which caused it to
incorrectly print warnings on each boot, and make the warning text
more consistent with the rest of the code
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn()
ARM: 8183/1: l2c: Improve l2c310_of_parse() error message
ARM: 8181/1: Drop extra return statement
ARM: 8182/1: l2c: Make l2x0_cache_size_of_parse() return 'int'
ARM: enable bpf syscall
Linus Torvalds [Sun, 2 Nov 2014 20:31:02 +0000 (12:31 -0800)]
Merge tag 'for-linus' of git://git./virt/kvm/kvm
Pull kvm fixes from Paolo Bonzini:
"A small set of x86 fixes. The most serious is an SRCU lockdep fix.
A bit late - needed some time to test the SRCU fix, which only came in
on Friday"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: vmx: defer load of APIC access page address during reset
KVM: nVMX: Disable preemption while reading from shadow VMCS
KVM: x86: Fix far-jump to non-canonical check
KVM: emulator: fix execution close to the segment limit
KVM: emulator: fix error code for __linearize
Dave Airlie [Sun, 2 Nov 2014 19:23:17 +0000 (05:23 +1000)]
Merge branch 'exynos-drm-fixes' of git://git./linux/kernel/git/daeinki/drm-exynos into drm-fixes
This pull-request includes some bug fixes and code cleanups.
Especially, this fixes the bind failure issue occurred when it tries
to re-bind Exynos drm driver after unbound, and the modetest failure
issue incurred by not having a pair to vblank on and off requests.
* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
drm/exynos: correct connector->dpms field before resuming
drm/exynos: enable vblank after DPMS on
drm/exynos: init kms poll at the end of initialization
drm/exynos: propagate plane initialization errors
drm/exynos: vidi: fix build warning
drm/exynos: remove explicit encoder/connector de-initialization
drm/exynos: init vblank with real number of crtcs
Linus Torvalds [Sun, 2 Nov 2014 18:28:43 +0000 (10:28 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs
Pull VFS fixes from Al Viro:
"A bunch of assorted fixes, most of them followups to overlayfs merge"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
ovl: initialize ->is_cursor
Return short read or 0 at end of a raw device, not EIO
isofs: don't bother with ->d_op for normal case
isofs_cmp(): we'll never see a dentry for . or ..
overlayfs: fix lockdep misannotation
ovl: fix check for cursor
overlayfs: barriers for opening upper-layer directory
rcu: Provide counterpart to rcu_dereference() for non-RCU situations
staging: android: logger: Fix log corruption regression
This page took 0.046596 seconds and 5 git commands to generate.