GitHub/moto-9609/android_kernel_motorola_exynos9610.git
10 years agostaging: comedi: ni_mio_common: fix ni_ao_insn_read()
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:50 +0000 (12:23 -0700)]
staging: comedi: ni_mio_common: fix ni_ao_insn_read()

The comedi core expects (*insn_read) functions to return insn->n
data smaples. Fix this function to work like the core expects.

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>
10 years agostaging: comedi: ni_mio_common: remove ai_continuous from private data
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:49 +0000 (12:23 -0700)]
staging: comedi: ni_mio_common: remove ai_continuous from private data

This member of the private data can be determined by checking the
cmd->stop_src. Do that instead and remove the 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>
10 years agostaging: comedi: ni_mio_common: merge analog output (*insn_write) functions
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:48 +0000 (12:23 -0700)]
staging: comedi: ni_mio_common: merge analog output (*insn_write) functions

Currently the PCI6xxx boards use a different (*insn_write) function
for the analog output subdevice. Most of the code is identical to the
(*insn_write) used by all the other board types.

For aesthetics, merge the two (*insn_write) functions and handle the
'is_6xxx' differences in the common code.

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>
10 years agostaging: comedi: ni_mio_common: remove some unnecessary boardinfo access
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:47 +0000 (12:23 -0700)]
staging: comedi: ni_mio_common: remove some unnecessary boardinfo access

Currently ni_m_series_ao_config_chanlist() gets the boardinfo pointer in
order to get the number of analog output channels. Get this from the
comedi_subdevice instead.

The ni_old_ao_config_chanlist() function also gets the boardinfo pointer
to get the analog output resolution, 'aobits', in order to calculate the
value needed to convert samples from unsigned to two's complement for
bipolar ranges. Use the comedi_subdevice 'maxdata' instead.

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>
10 years agostaging: comedi: ni_mio_common: remove INSN_CONFIG_ANALOG_TRIG support code
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:46 +0000 (12:23 -0700)]
staging: comedi: ni_mio_common: remove INSN_CONFIG_ANALOG_TRIG support code

None of the boardinfo that uses this code sets the 'has_analog_trig' flag so
ni_ai_config_analog_trig() always returns -EINVAL.

Also, the private data 'atrig_low', 'atrig_high', and 'atrig_mode' values
that are set by ni_ai_config_analog_trig() are never used.

Remove the incomplete INSN_CONFIG_ANALOG_TRIG support along with the unused
boardinfo and private data members.

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>
10 years agostaging: comedi: ni_mio_common: tidy up ni_ao_munge()
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:45 +0000 (12:23 -0700)]
staging: comedi: ni_mio_common: tidy up ni_ao_munge()

Use the bytes_per_sample() helper instead of 'sizeof(short)' to clarify
the length calculation.

Use comedi_offset_munge() to handle the unsigned to two's complement
munge of the data for bipolar ranges.

Tidy up the local variables.

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>
10 years agostaging: comedi: ni_stc.h: add some 'is_{board type}' flags to private data
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:44 +0000 (12:23 -0700)]
staging: comedi: ni_stc.h: add some 'is_{board type}' flags to private data

The board->reg_type if checked quite often in the ni_mio_common.c code to
handle differences in the PCI devices supported by the ni_pcimio driver.
Simplify the code a bit by adding some 'is_{board type}' bit-field flags
to the private data.

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>
10 years agostaging: comedi: ni_mio_common: fix ni_ao_insn_write()
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:43 +0000 (12:23 -0700)]
staging: comedi: ni_mio_common: fix ni_ao_insn_write()

Comedi (*insn_write) functions are expected to write insn->n values
to the hardware. Fix this function to work like the core expects.

Also, don't rely on the return value of ni_ao_comfig_chanlist() to
determine if the values need converted to two's complement before
writing to the hardware. Use the comedi_range_is_bipolar() and
comedi_offset_munge() helpers to clarify the code.

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>
10 years agostaging: comedi: ni_mio_common: remove ao_win_out() macro
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:42 +0000 (12:23 -0700)]
staging: comedi: ni_mio_common: remove ao_win_out() macro

This marco relies on a local variable having a specific name. Remove the
macro and just use ni_ao_win_outw() directly.

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>
10 years agostaging: comedi: ni_mio_common: fix ni_ao_insn_write_671x()
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:41 +0000 (12:23 -0700)]
staging: comedi: ni_mio_common: fix ni_ao_insn_write_671x()

Comedi (*insn_write) functions are expected to write insn->n values to
the hardware. Fix this function to work like the core expects.

Also, use the comedi_offset_munge() helper to convert the comedi unsigned
values into the two's complement values that the hardware needs.

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>
10 years agostaging: comedi: ni_stc.h: remove 'ao_unipolar' flag from ni_board_struct
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:40 +0000 (12:23 -0700)]
staging: comedi: ni_stc.h: remove 'ao_unipolar' flag from ni_board_struct

This member of the boardinfo for the NI MIO drivers is used to indicate if
the ranges for the analog output subdevice (ao_range_table in the boardinfo)
includes any unipolar ranges. If it's not set, the ao_range_table only has
bipolar ranges.

The 'ao_unipolar' flag is checked when munging the ao data values from the
user so that the values for bipolar ranges are converted to 2's complement
values before they are written to the hardware.

The flag is also used when programming the analog output configuration on
non-M series boards for bipolar/unipolar and external reference operation.

Simplify the driver a bit by removing this boardinfo flag and just using
the comedi_range_is_bipolar() and comedi_range_is_external() helpers to
check the range directly.

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>
10 years agostaging: comedi: comedidev.h: introduce some 'range_is_external' helpers
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:39 +0000 (12:23 -0700)]
staging: comedi: comedidev.h: introduce some 'range_is_external' helpers

The comedi_krange includes a flags member that currently identifies the
'units' of the range (RF_UNIT) and if the range is from an internal or
external source (RF_EXTERNAL).

Introduce some helper functions to check if a given range is from an
external source.

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>
10 years agostaging: comedi: mite.h: tidy up the mite channel register offsets
H Hartley Sweeten [Mon, 14 Jul 2014 19:23:38 +0000 (12:23 -0700)]
staging: comedi: mite.h: tidy up the mite channel register offsets

Convert the inline MITE_* functions, used to calculate the mite channel
register offsets, into simple macros.

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>
10 years agostaging: comedi: ni_65xx: factor input filter disable out of (*auto_attach)
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:08 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: factor input filter disable out of (*auto_attach)

For aesthetics, factor the code that disables the input filters out of
ni_65xx_auto_attach().

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>
10 years agostaging: comedi: ni_65xx: fix digital output reset during attach
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:07 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: fix digital output reset during attach

During the attach of this driver, the digital output ports are all
initialized to a known state. Some of the boards supported by this
driver have output ports that are inverted from the comedi view of
the output state. For these boards the values written to the ports
needs to be inverted.

Currently, only bit 0 of each port is inverted when the boardinfo
indicates that the outputs are inverted. This results in channels
0, 8, 16, etc. being set to '0' and all other channels being set
to '1'. If the boardinfo does not indicate that the outputs are
inverted, all the channels are set to '0'.

This initialization is unnecessary for the input only ports. The
input/output ports also do not need to be initialized since they
are configured as inputs during the attach.

Move the output port initialization so it occurs when the digital
output subdevice is setup. Use the 's->io_bits' value to initialize
the ports so that the correct inverted/non-inverted state is used
for the comedi '0' value.

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>
10 years agostaging: comedi: ni_65xx: use the subdevice 'io_bits' to handle the 'invert_outputs'
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:06 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: use the subdevice 'io_bits' to handle the 'invert_outputs'

Some of the boards supported by this driver have output ports that are
inverted from the comedi view of the output state. For these boards the
read values from the output ports needs to be inverted before being
modified and inverted again before being written back in the (*insn_bits)
operation.

Currently the subdevice type and the boardinfo is checked in the (*insn_bits)
to determine if the inverted outputs need to be handled.

Since thise driver does not use the subdevice 'io_bits', simplify the driver
a bit by initializing the 'io_bits' during the attach to handle the inversion.

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>
10 years agostaging: comedi: ni_65xx: remove 'output_bits' from private data
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:05 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: remove 'output_bits' from private data

Remove the need for the 'output_bits' in the private data by just
reading the current state of the data port when updating the output
channels in the (*insn_bits) function.

Add a local variable to handle the inverting of the hardware values
when the boardinfo indicates that the outputs are inverted.

Rename the local variable 'port_read_bits' to 'bits' so that we can
use it for updating the output channels and reading back the actual
state to return 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>
10 years agostaging: comedi: ni_65xx: tidy ni_65xx_intr_insn_bits() declaration
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:04 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: tidy ni_65xx_intr_insn_bits() declaration

For aesthetics, tidy up the whitespace of this function declarations to
follow the form in the rest of the driver.

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>
10 years agostaging: comedi: ni_65xx: update the MODULE_DESCRIPTION
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:03 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: update the MODULE_DESCRIPTION

Update the MODULE_DESCRIPTION to better describe the driver.

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>
10 years agostaging: comedi: ni_65xx: clean up multi-line comments
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:02 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: clean up multi-line comments

Clean up the multi-line comments at the beginning of the file so they
follow the kernel CodingStyle.

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>
10 years agostaging: comedi: ni_65xx: tidy up the comedi_driver declaration
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:01 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: tidy up the comedi_driver declaration

For aesthetics, add some whitespace to the comedi_driver declaration.

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>
10 years agostaging: comedi: ni_65xx: tidy up the subdevice initialization
H Hartley Sweeten [Mon, 14 Jul 2014 19:07:00 +0000 (12:07 -0700)]
staging: comedi: ni_65xx: tidy up the subdevice initialization

For aesthetics, add some whitespace to the subdevice init.

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>
10 years agostaging: comedi: ni_65xx: tidy up the port<->chan conversions
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:59 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: tidy up the port<->chan conversions

Introduce some convienence macros to handle the port to channel,
channel to port, and channel mask calculations based on the 8
channels per port of the hardware.

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>
10 years agostaging: comedi: ni_65xx: fix ni_65xx_intr_insn_config()
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:58 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: fix ni_65xx_intr_insn_config()

Refactor this function to follow the standard (*insn_config) form.

Add a sanity check of the number of data parameters (insn->n). Currently
the core does not check INSN_CONFIG_CHANGE_NOTIFY.

Fix the writes to the rise/fall edge enable registers. The macro expects
a "port" value not the port offset value.

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>
10 years agostaging: comedi: ni_65xx: hook up command support only if irq is available
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:57 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: hook up command support only if irq is available

Subdevice 3 is used in this driver to provide edge detection of the input
channels.

Move the reset/disable of the interrupts and the request_irq() so that
when subdevice 3 is setup we can conditionally hookup the async command
support only if the irq is available.

Also, remove the noise when the irq is not available.

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>
10 years agostaging: comedi: ni_65xx: remove the need for the subdevice private data
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:56 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: remove the need for the subdevice private data

There is only one member in the subdevice private data, an unsigned value
that is the 'base_port' that the subdevice uses to access the port registers.

Just cast the appropriate value into s->private instead of allocating the
private data for each subdevice. The casts are a bit of a nusance but it
removes the unnecessary allocations.

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>
10 years agostaging: comedi: ni_65xx: remove 'dio_direction' from private data
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:55 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: remove 'dio_direction' from private data

The IO Select registers are readable. Remove the need for the
'dio_direction' member in the private data by just checking the
register value for the INSN_CONFIG_DIO_QUERY instruction.

Also, refactor the switch statement to return -EINVAL for unhandled
instructions and have the (*insn_config) return insn->n normally.

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>
10 years agostaging: comedi: ni_65xx: cleanup INSN_CONFIG_FILTER handling
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:54 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: cleanup INSN_CONFIG_FILTER handling

The INSN_CONFIG_FILTER instruction is used to set the deglitch filter
interval used to debounce the input channels.

Absorb the helper function into the (*insn_config) function and refactor
the code to not require the 'filter_interval' and 'filter_enable' members
in the private data.

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>
10 years agostaging: comedi: ni_65xx: cleanup recurring register map
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:53 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: cleanup recurring register map

Convert the inline functions used to calculate the offsets to the
recurring port registers and rename them to remove the CamelCase.

Define all the recurring registers.

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>
10 years agostaging: comedi: ni_65xx: cleanup non-recurring register map defines
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:52 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: cleanup non-recurring register map defines

Rename the CamelCase defines used for the non-recurring registers.

Define all the non-recurring registers and bits.

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>
10 years agostaging: comedi: ni_65xx: filter interval register is 32-bit
H Hartley Sweeten [Mon, 14 Jul 2014 19:06:51 +0000 (12:06 -0700)]
staging: comedi: ni_65xx: filter interval register is 32-bit

According to the register programming manual, the filter interval
register is 32-bit. Fix the writes to this register.

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>
10 years agostaging: unisys: added virtpci info entry
Erik Arfvidson [Wed, 16 Jul 2014 20:03:20 +0000 (16:03 -0400)]
staging: unisys: added virtpci info entry

This patch adds the virtpci debugfs directory and the info entry
inside of it.

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: ni_670x: remove COMEDI_MITE and HAS_DMA dependancy
H Hartley Sweeten [Mon, 14 Jul 2014 18:54:29 +0000 (11:54 -0700)]
staging: comedi: ni_670x: remove COMEDI_MITE and HAS_DMA dependancy

The mite module provides the DMA interface for the PCI MITE ASIC used on
many National Instruments DAQ boards. This driver does not use DMA and only
depends on the mite module to initialize the MITE ASIC.

Handle the initialization localy and remove the unnecessary dependancies.

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>
10 years agostaging: comedi: ni_65xx: remove COMEDI_MITE and HAS_DMA dependancy
H Hartley Sweeten [Mon, 14 Jul 2014 18:54:28 +0000 (11:54 -0700)]
staging: comedi: ni_65xx: remove COMEDI_MITE and HAS_DMA dependancy

The mite module provides the DMA interface for the PCI MITE ASIC used on
many National Instruments DAQ boards. This driver does not use DMA and only
depends on the mite module to initialize the MITE ASIC.

Handle the initialization localy and remove the unnecessary dependancies.

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>
10 years agostaging: comedi: ni_labpc_pci: remove COMEDI_MITE and HAS_DMA dependancy
H Hartley Sweeten [Mon, 14 Jul 2014 18:54:27 +0000 (11:54 -0700)]
staging: comedi: ni_labpc_pci: remove COMEDI_MITE and HAS_DMA dependancy

The mite module provides the DMA interface for the PCI MITE ASIC used on
many National Instruments DAQ boards. This driver does not use DMA and only
depends on the mite module to initialize the MITE ASIC.

Handle the initialization localy and remove the unnecessary dependancies.

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>
10 years agostaging: comedi: 8255_pci: remove include of mite.h
H Hartley Sweeten [Mon, 14 Jul 2014 18:54:26 +0000 (11:54 -0700)]
staging: comedi: 8255_pci: remove include of mite.h

The mite.h header is included only to pickup the MITE_IODWBSR and WENAB defines
needed to set the data window (PCI BAR 1) when initializing the PCI MITE ASIC
on the National Instruments boards supported by this driver.

Remove the include of mite.h by adding the two defines locally in this driver.

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>
10 years agostaging: comedi: addi_apci_1564: use addi_watchdog module to init watchdog subdevice
Chase Southwood [Sat, 12 Jul 2014 22:44:09 +0000 (17:44 -0500)]
staging: comedi: addi_apci_1564: use addi_watchdog module to init watchdog subdevice

Use the addi_watchdog module to provide support for the watchdog
subdevice.

Also, rearrange the subdevice init blocks so that the order makes sense.
Digital input/output subdevices and subdevices for DI/DO interrupt
support, followed by timer/counter/watchdog subdevices is the new order.

Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: addi_apci_1564: driver no longer needs to include addi_common.h
Chase Southwood [Sat, 12 Jul 2014 22:42:36 +0000 (17:42 -0500)]
staging: comedi: addi_apci_1564: driver no longer needs to include addi_common.h

This driver no longer depends on anything in addi_common.h, save for a
few headers that it was including indirectly.  Remove the include of
addi_common.h and add the includes of <linux/interrupt.h>
and <linux/sched.h> directly.

Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: emxx_udc: Fix coding style errors
KANG Yuxuan [Wed, 16 Jul 2014 02:45:01 +0000 (10:45 +0800)]
staging: emxx_udc: Fix coding style errors

Only fixing errors reported by checkpatch.pl, based on the following
rules:
1. '*' should be adjacent to the data name or function name.
2. Don't use C99-style "// ..." comments.

Signed-off-by: KANG Yuxuan <stonekyx@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6556: Cleanup coding style: indentation
Peter Senna Tschudin [Tue, 15 Jul 2014 21:23:27 +0000 (23:23 +0200)]
staging: vt6556: Cleanup coding style: indentation

This patch cleanup the follwoing coding style issues:
 - indentation style
 - new line after declaration

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6556: Cleanup coding style: lines over 80 chars
Peter Senna Tschudin [Tue, 15 Jul 2014 21:23:26 +0000 (23:23 +0200)]
staging: vt6556: Cleanup coding style: lines over 80 chars

This patch cleanup the follwoing coding style issues:
 - line over 80 chars
 - spaces on the beginning of a line
 - put { and } on the correct places

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6556: Cleanup coding style: comments
Peter Senna Tschudin [Tue, 15 Jul 2014 21:23:25 +0000 (23:23 +0200)]
staging: vt6556: Cleanup coding style: comments

This patch cleanup coding style issues on comments.

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6556: Cleanup coding style: #define
Peter Senna Tschudin [Tue, 15 Jul 2014 21:23:24 +0000 (23:23 +0200)]
staging: vt6556: Cleanup coding style: #define

This patch cleanup coding style issues on #defines.

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6556: Cleanup indentation on statements
Peter Senna Tschudin [Tue, 15 Jul 2014 20:46:48 +0000 (22:46 +0200)]
staging: vt6556: Cleanup indentation on statements

Use tabs instead of spaces in a set of statements and fix lines
over 80 chars. Reported by checkpatch.

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: unisys: remove proc entries from /proc/visorchipset/controlvm
Benjamin Romer [Tue, 15 Jul 2014 17:30:41 +0000 (13:30 -0400)]
staging: unisys: remove proc entries from /proc/visorchipset/controlvm

Remove the code that generates proc entries for the controlVM channel.
These entries are no longer necessary for debug.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoMerge 'delete tidspbridge branch' into staging-next
Greg Kroah-Hartman [Wed, 16 Jul 2014 04:01:37 +0000 (21:01 -0700)]
Merge 'delete tidspbridge branch' into staging-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoARM: OMAP2+: remove DSP platform device
Kristina Martšenko [Tue, 15 Jul 2014 23:30:19 +0000 (02:30 +0300)]
ARM: OMAP2+: remove DSP platform device

It was added to support DSP Bridge. Since DSP Bridge was removed, and
nothing else is using the platform device, remove it too.

Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Cc: Omar Ramirez Luna <omar.ramirez@copitl.com>
Cc: Suman Anna <s-anna@ti.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: tidspbridge: remove driver
Kristina Martšenko [Tue, 15 Jul 2014 23:30:18 +0000 (02:30 +0300)]
staging: tidspbridge: remove driver

The driver has been broken and disabled for several kernel versions now.
It doesn't have a maintainer anymore, and most of the people who've
worked on it have moved on. There's also still a long list of issues in
the TODO file before it can be moved out of staging. Until someone can
put in the work to make the driver work again and move it out of
staging, remove it from the kernel.

Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Cc: Omar Ramirez Luna <omar.ramirez@copitl.com>
Cc: Suman Anna <s-anna@ti.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging:tidspbridge Fix minor checkpatch.pl warining Unnecessary parentheses
Adithya Krishnamurthy [Tue, 15 Jul 2014 16:48:20 +0000 (22:18 +0530)]
Staging:tidspbridge Fix minor checkpatch.pl warining Unnecessary parentheses

Fixed checkpatch "WARNING: Unnecessary parentheses"

Signed-off-by: Adithya Krishnamurthy <linux.challenge1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging:tidspbridge Fix minor checkpatch.pl warning unnecessary whitespace before...
Adithya Krishnamurthy [Tue, 15 Jul 2014 16:48:19 +0000 (22:18 +0530)]
Staging:tidspbridge Fix minor checkpatch.pl warning unnecessary whitespace before a quoted newline

Fixed checkpatch "WARNING: unnecessary whitespace before a quoted newline"

Signed-off-by: Adithya Krishnamurthy <linux.challenge1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging:tidspbridge Fix checkpatch.pl warning char * array declaration might be bette...
Adithya Krishnamurthy [Tue, 15 Jul 2014 16:48:18 +0000 (22:18 +0530)]
Staging:tidspbridge Fix checkpatch.pl warning char * array declaration might be better as static const

Fixed checkpatch "WARNING: char * array declaration might be better as static const"

Signed-off-by: Adithya Krishnamurthy <linux.challenge1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: removing not useful `else` after return
Kinka Huang [Tue, 15 Jul 2014 15:11:02 +0000 (23:11 +0800)]
staging: comedi: removing not useful `else` after return

Signed-off-by: Kinka Huang <kinkabrain@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: usbpipe irrelevant function descriptions
Malcolm Priestley [Tue, 15 Jul 2014 18:54:43 +0000 (19:54 +0100)]
staging: vt6656: usbpipe irrelevant function descriptions

All these have no or vague meaning.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rename s_nsBulkInUsbIoCompleteRead to vnt_submit_rx_urb_complete
Malcolm Priestley [Tue, 15 Jul 2014 18:54:42 +0000 (19:54 +0100)]
staging: vt6656: rename s_nsBulkInUsbIoCompleteRead to vnt_submit_rx_urb_complete

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rename PIPEnsBulkInUsbRead to vnt_submit_rx_urb
Malcolm Priestley [Tue, 15 Jul 2014 18:54:41 +0000 (19:54 +0100)]
staging: vt6656: rename PIPEnsBulkInUsbRead to vnt_submit_rx_urb

The function just submits to rx urbs.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rename s_nsBulkOutIoCompleteWrite to vnt_tx_context_complete
Malcolm Priestley [Tue, 15 Jul 2014 18:54:40 +0000 (19:54 +0100)]
staging: vt6656: rename s_nsBulkOutIoCompleteWrite to vnt_tx_context_complete

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rename PIPEnsSendBulkOut to vnt_tx_context.
Malcolm Priestley [Tue, 15 Jul 2014 18:54:39 +0000 (19:54 +0100)]
staging: vt6656: rename PIPEnsSendBulkOut to vnt_tx_context.

We are just tx the context

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rename s_nsInterruptUsbIoCompleteRead to vnt_start_interrupt_urb_com...
Malcolm Priestley [Tue, 15 Jul 2014 18:54:38 +0000 (19:54 +0100)]
staging: vt6656: rename s_nsInterruptUsbIoCompleteRead to vnt_start_interrupt_urb_complete

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: usbpipe rename PIPEnsInterruptRead to vnt_start_interrupt_urb
Malcolm Priestley [Tue, 15 Jul 2014 18:54:37 +0000 (19:54 +0100)]
staging: vt6656: usbpipe rename PIPEnsInterruptRead to vnt_start_interrupt_urb

Drop Read and PIPE. The function starts the interrupt urb.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: int.c remove irrelevant function description
Malcolm Priestley [Tue, 15 Jul 2014 18:54:36 +0000 (19:54 +0100)]
staging: vt6656: int.c remove irrelevant function description

The function does not directly poll from here

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rename INTvWorkItem to vnt_int_start_interrupt
Malcolm Priestley [Tue, 15 Jul 2014 18:54:35 +0000 (19:54 +0100)]
staging: vt6656: rename INTvWorkItem to vnt_int_start_interrupt

This function does run as work item, it starts interrupts from the
device.

Rename to vnt_int_start_interrupt

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: int rename INTnsProcessData to vnt_int_process_data
Malcolm Priestley [Tue, 15 Jul 2014 18:54:34 +0000 (19:54 +0100)]
staging: vt6656: int rename INTnsProcessData to vnt_int_process_data

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: int.c Replace DBG_PRT debug messages
Malcolm Priestley [Tue, 15 Jul 2014 18:54:33 +0000 (19:54 +0100)]
staging: vt6656: int.c Replace DBG_PRT debug messages

Replace with dev_dbg

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: INTvWorkItem remove camel case
Malcolm Priestley [Tue, 15 Jul 2014 18:54:32 +0000 (19:54 +0100)]
staging: vt6656: INTvWorkItem remove camel case

Camel case changes
pDevice -> priv
ntStatus -> status

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: android: Clean up else statement from binder_send_failed_reply
Lucas Tanure [Mon, 14 Jul 2014 00:31:05 +0000 (21:31 -0300)]
staging: android: Clean up else statement from binder_send_failed_reply

Kernel coding style. Remove useless else statement after return.

Changes from v1 and v2: Fix warning for mixed declarations and code.
Declaration of "struct binder_transaction *next" made outside of while.

Changes from v3: Removed initialization to NULL for next variable.

Signed-off-by: Lucas Tanure <tanure@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: android: Clean up else statement from sync_fence_poll()
Lucas Tanure [Tue, 15 Jul 2014 03:32:35 +0000 (00:32 -0300)]
staging: android: Clean up else statement from sync_fence_poll()

Kernel coding style. Remove useless else statement after return.

Signed-off-by: Lucas Tanure <tanure@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: octeon: fix coding style
Rahul Bedarkar [Mon, 14 Jul 2014 17:21:15 +0000 (22:51 +0530)]
staging: octeon: fix coding style

This patch fixes checkpatch.pl warning. Add blank line after
declaration.

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8821ae: delete unneeded lines in cam.c
Joerg C. Meyer [Mon, 14 Jul 2014 14:48:50 +0000 (16:48 +0200)]
Staging: rtl8821ae: delete unneeded lines in cam.c

This is a patch to the cam.c file that removes some unneeded lines of commented-out code

Signed-off-by: Joerg C. Meyer <joerg@meyer.homedns.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: remove dgap_newnode()
Daeseok Youn [Tue, 15 Jul 2014 09:50:37 +0000 (18:50 +0900)]
staging: dgap: remove dgap_newnode()

The dgap_newnode() is useless for creating new node.
So just use kzalloc and set a type in case statement.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: remove unused a parameter in dgap_gettok()
Daeseok Youn [Tue, 15 Jul 2014 09:49:52 +0000 (18:49 +0900)]
staging: dgap: remove unused a parameter in dgap_gettok()

The "p" as parameter is unused.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: fix a typo in dgap_gettok()
Daeseok Youn [Tue, 15 Jul 2014 09:49:09 +0000 (18:49 +0900)]
staging: dgap: fix a typo in dgap_gettok()

The "boar" should be "board".

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: remove unused case value in dgap_parsefile()
Daeseok Youn [Tue, 15 Jul 2014 09:48:25 +0000 (18:48 +0900)]
staging: dgap: remove unused case value in dgap_parsefile()

If rc is zero, this function will returns with an error and
cannot reach switch-case statement.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: remove redundant error value check
Daeseok Youn [Tue, 15 Jul 2014 09:47:11 +0000 (18:47 +0900)]
staging: dgap: remove redundant error value check

The retval in dgap_block_til_ready() is initialized to zero,
and if no error has occurred in this function, the retval has a zero.
So it doesn't need to check "retval" itself.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Shortened lines
Matthias Beyer [Tue, 15 Jul 2014 07:43:15 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Shortened lines

This patch shortenes all lines where possible without code refactoring,
as well as comment lines. It does not change the wording of comments.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Replaced if-else return code with simple return assertion
Matthias Beyer [Tue, 15 Jul 2014 07:43:14 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced if-else return code with simple return assertion

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Replaced member accessing with variable in CreateSFToClass...
Matthias Beyer [Tue, 15 Jul 2014 07:43:13 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced member accessing with variable in CreateSFToClassifierRuleMapping()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Simplified nested if statements by linking them with logic...
Matthias Beyer [Tue, 15 Jul 2014 07:43:12 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Simplified nested if statements by linking them with logical AND in GetPhsRuleEntry()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Simplified nested if statements by linking them with logic...
Matthias Beyer [Tue, 15 Jul 2014 07:43:11 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Simplified nested if statements by linking them with logical AND in GetServiceFlowEntry()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Simplified nested if statements by linking them with logic...
Matthias Beyer [Tue, 15 Jul 2014 07:43:10 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Simplified nested if statements by linking them with logical AND in GetServiceFlowEntry()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Replaced member accessing with variable in GetServiceFlowE...
Matthias Beyer [Tue, 15 Jul 2014 07:43:09 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced member accessing with variable in GetServiceFlowEntry()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Added const keyword to ValidatePHSRUleComplete() argument
Matthias Beyer [Tue, 15 Jul 2014 07:43:08 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Added const keyword to ValidatePHSRUleComplete() argument

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Rewrote ValidatePHSRuleComplete()
Matthias Beyer [Tue, 15 Jul 2014 07:43:07 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Rewrote ValidatePHSRuleComplete()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Replaced indentation level with goto jump on bad condition
Matthias Beyer [Tue, 15 Jul 2014 07:43:06 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced indentation level with goto jump on bad condition

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Replaced member accessing with variable in free_phs_service()
Matthias Beyer [Tue, 15 Jul 2014 07:43:05 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced member accessing with variable in free_phs_service()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Added missing braces around else block
Matthias Beyer [Tue, 15 Jul 2014 07:43:04 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Added missing braces around else block

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Whitespace cleanup in PhsCompress()
Matthias Beyer [Tue, 15 Jul 2014 07:43:03 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Whitespace cleanup in PhsCompress()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Replaced member accessing with variables
Matthias Beyer [Tue, 15 Jul 2014 07:43:02 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Replaced member accessing with variables

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Reduced indentation by using jump label in PhsDeleteSFRules()
Matthias Beyer [Tue, 15 Jul 2014 07:43:01 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Reduced indentation by using jump label in PhsDeleteSFRules()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Shortened lines
Matthias Beyer [Tue, 15 Jul 2014 07:43:00 +0000 (09:43 +0200)]
Staging: bcm: PHSModule.c: Shortened lines

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Reduced indentation level by using jump label
Matthias Beyer [Tue, 15 Jul 2014 07:42:59 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Reduced indentation level by using jump label

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Replaced nested if statements with logical AND concatenati...
Matthias Beyer [Tue, 15 Jul 2014 07:42:58 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Replaced nested if statements with logical AND concatenation of the conditions

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Replaced member accessing with variable in PhsDeletePHSRule()
Matthias Beyer [Tue, 15 Jul 2014 07:42:57 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Replaced member accessing with variable in PhsDeletePHSRule()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Outsourced debug printing for phs classifier entry
Matthias Beyer [Tue, 15 Jul 2014 07:42:56 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Outsourced debug printing for phs classifier entry

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Outsourced debug printing in own function
Matthias Beyer [Tue, 15 Jul 2014 07:42:55 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Outsourced debug printing in own function

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: PHSModule.c: Whitespace & Indentation cleanup
Matthias Beyer [Tue, 15 Jul 2014 07:42:54 +0000 (09:42 +0200)]
Staging: bcm: PHSModule.c: Whitespace & Indentation cleanup

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6556: Remove double parentheses
Peter Senna Tschudin [Mon, 14 Jul 2014 19:15:29 +0000 (21:15 +0200)]
staging: vt6556: Remove double parentheses

This patch cleanup a checkpatch warning by removing double parentheses
from if condition. Additionally it fixes a line over 80 chars.

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: set BBvSetAntennaMode in device_init_registers
Malcolm Priestley [Mon, 14 Jul 2014 18:43:06 +0000 (19:43 +0100)]
staging: vt6656: set BBvSetAntennaMode in device_init_registers

BBvSetAntennaMode is not set at all, set to byRxAntennaMode

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: device.h remove old wireless stats
Malcolm Priestley [Mon, 14 Jul 2014 18:43:05 +0000 (19:43 +0100)]
staging: vt6656: device.h remove old wireless stats

These are dead nolonger of use.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agodrivers: staging: lustre: Use 'force_die' instead of 'die' to avoid compiling issue
Chen Gang [Mon, 14 Jul 2014 11:59:13 +0000 (19:59 +0800)]
drivers: staging: lustre: Use 'force_die' instead of 'die' to avoid compiling issue

Some of architectures have already defined 'die' as macro, so can not
use it as declaration or definition in other modules, or it will cause
compiling issue.

So use more precise name 'force_die' (like 'wrap_bulk') instead of. And
the related error (with allmodconfig under score):

    CC [M]  drivers/staging/lustre/lustre/ptlrpc/sec.o
  drivers/staging/lustre/lustre/ptlrpc/sec.c: In function 'sptlrpc_cli_ctx_expire':
  drivers/staging/lustre/lustre/ptlrpc/sec.c:309:13: error: 'struct ptlrpc_ctx_ops' has no member named '__die'
    ctx->cc_ops->die(ctx, 0);
               ^
  drivers/staging/lustre/lustre/ptlrpc/sec.c: In function 'ctx_refresh_timeout':
  drivers/staging/lustre/lustre/ptlrpc/sec.c:594:26: error: 'struct ptlrpc_ctx_ops' has no member named '__die'
     req->rq_cli_ctx->cc_ops->die(req->rq_cli_ctx, 0);
                            ^
  make[5]: *** [drivers/staging/lustre/lustre/ptlrpc/sec.o] Error 1
  make[4]: *** [drivers/staging/lustre/lustre/ptlrpc] Error 2
  make[3]: *** [drivers/staging/lustre/lustre] Error 2
  make[2]: *** [drivers/staging/lustre] Error 2
  make[1]: *** [drivers/staging] Error 2
  make: *** [drivers] Error 2

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoMerge 3.16-rc5 into staging-next
Greg Kroah-Hartman [Sun, 13 Jul 2014 22:35:56 +0000 (15:35 -0700)]
Merge 3.16-rc5 into staging-next

We want the fixes in -rc5 in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>