OSDN Git Service
Guillaume Clement [Thu, 24 Jul 2014 23:06:27 +0000 (01:06 +0200)]
staging: vt6655: remove unused macro
The MAC_MAX_CONTEXT_SIZE macro was not enclosed into parenthesis,
which might have caused hard to debug errors, and caused a sparse
warning.
Since it is unused, we might as well remove it.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:26 +0000 (01:06 +0200)]
staging: vt6655: fix braces at newline in if statements
Braces should not be in a separate line for multi-line if
statements. This fixes warnings reported by checkpatch.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:25 +0000 (01:06 +0200)]
staging: vt6655: remove braces for single statements if
This fixes several "braces {} are not necessary for single statement
blocks" checkpatch warnings.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:24 +0000 (01:06 +0200)]
staging: vt6655: add missing whitespace
Some whitespace were missing, causing checkpatch warnings and altering
readability.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:23 +0000 (01:06 +0200)]
staging: vt6655: Remove unreachable break statements
This fixes break "break is not useful after a goto or return"
checkpatch warnings.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:22 +0000 (01:06 +0200)]
staging: vt6655: break single line if statements
This fixes the "trailing statements should be on next line" checkpatch
warning.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:21 +0000 (01:06 +0200)]
staging: vt6655: Use pr_* functions instead of printk
Lots of printk are used in vt6655, replace them with the pr_*
equivalent.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:20 +0000 (01:06 +0200)]
staging: vt6655: fix static position in inline function
This should be "static inline", not "inline static". Reported by
checkpatch.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:19 +0000 (01:06 +0200)]
staging: vt6655: fix braces at newline for structs
For structs definitions, the braces should be at the end of the
line. Reported by checkpatch.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:18 +0000 (01:06 +0200)]
staging: vt6655: fix function braces not on the proper line
Function braces should be on a separate line. Reported by checkpatch.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:17 +0000 (01:06 +0200)]
staging: vt6655: Remove spaces before quoted newlines
This fixes several spaces added just before a newline in debug
strings, reported by checkpatch.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:16 +0000 (01:06 +0200)]
staging: vt6655: Add missing blank lines after declarations
This patch fixes the missing blank lines after declarations in vt6655
reported by checkpatch.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Guillaume Clement [Thu, 24 Jul 2014 23:06:15 +0000 (01:06 +0200)]
staging: vt6655: remove useless return statements
Many return statements in void function were present at the end of
functions, with no effect. They now are removed.
This fixes a bunch of checkpatch warnings.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 22:34:18 +0000 (23:34 +0100)]
staging: vt6656: wcmd.h remove dead macros
AUTHENTICATE_TIMEOUT
ASSOCIATE_TIMEOUT
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 22:34:17 +0000 (23:34 +0100)]
staging: vt6656: rf.h cleanup C_PWBT comments
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 22:34:16 +0000 (23:34 +0100)]
staging: vt6656: power.h remove dead macros
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 22:34:15 +0000 (23:34 +0100)]
staging: vt6656: dpc remove unneeded headers
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 22:34:14 +0000 (23:34 +0100)]
staging: vt6656: dpc.h remove dead function prototypes
Removing
RXvWorkItem
RXvFreeRCB
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 24 Jul 2014 17:15:05 +0000 (10:15 -0700)]
staging: comedi: ni_tio: convert printk to pr_err
Convert the printk(KERN_ERR ...) in ni_m_clk_src() to a pr_err().
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, 24 Jul 2014 17:15:04 +0000 (10:15 -0700)]
staging: comedi: ni_tio: remove forward declarations
Move some of the functions to remove the need for the forward
declarations.
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, 24 Jul 2014 17:15:03 +0000 (10:15 -0700)]
staging: comedi: ni_tio: tidy up ni_tio_set_clock_src() and helpers
Do some renaming of local vars, etc. to tidy up the ugly line breaks
to improve the readability of 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>
H Hartley Sweeten [Thu, 24 Jul 2014 17:15:02 +0000 (10:15 -0700)]
staging: comedi: ni_tio: tidy up ni_tio_get_clock_src()
Remove the static const local variable and add a blank line after
the declarations.
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, 24 Jul 2014 17:15:01 +0000 (10:15 -0700)]
staging: comedi: ni_tio: absorb ni_tio_set_first_gate_modifiers()
This function is only called by ni_tio_set_gate_src(). For aesthetics,
absorb the code into that function..
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, 24 Jul 2014 17:15:00 +0000 (10:15 -0700)]
staging: comedi: ni_tio: tidy up ni_tio_set_gate_src() and helpers
Do some renaming of local vars, parameters, etc. to tidy up the ugly
line breaks to improve the readability of 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>
H Hartley Sweeten [Thu, 24 Jul 2014 17:14:59 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up ni_tio_set_other_src()
Invert the counter_dev->variant test to reduce the indent level of
this function.
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, 24 Jul 2014 17:14:58 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up ni_tio_get_gate_src() and helpers
Do some renaming of local vars, parameters, etc. to tidy up the ugly
line breaks to improve the readability of 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>
H Hartley Sweeten [Thu, 24 Jul 2014 17:14:57 +0000 (10:14 -0700)]
staging: comedi: ni_tio: absorb ni_tio_counter_status()
This function is only called to handle the INSN_CONFIG_GET_COUNTER_STATUS
instruction. For aesthetics, absorb the code into ni_tio_insn_config().
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, 24 Jul 2014 17:14:56 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up ni_tio_set_sync_mode()
Fix the > 80 char line issues in this function.
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, 24 Jul 2014 17:14:55 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up ni_660x_source_select_bits()
Rename a local variable to fix the > 80 char line issues.
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, 24 Jul 2014 17:14:54 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up ni_m_series_source_select_bits()
Rename a local variable to fix the > 80 char line issues.
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, 24 Jul 2014 17:14:53 +0000 (10:14 -0700)]
staging: comedi: ni_tio: rename ni_tio_second_gate_registers_present()
For aesthetics, rename this function to shorten some of the long lines.
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, 24 Jul 2014 17:14:52 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up ni_tio_init_counter()
This function is called to initialize/reset a gpct counter during a
comedi drivers (*attach).
For aesthetics, move this exported function toward the end of the file.
Tidy up the functions a bit by just open coding the '0x0' values used
to initialize some of the 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>
H Hartley Sweeten [Thu, 24 Jul 2014 17:14:51 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up ni_gpct_device_{construct,destroy)()
For aesthetics, move these exported functions to the end of the file.
Tidy up the functions a bit and remove the BUG_ON when (num_counters == 0).
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, 24 Jul 2014 17:14:50 +0000 (10:14 -0700)]
staging: comedi: ni_tio: move defines to head of file
For aesthetics, move all the defines to the head of the file.
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, 24 Jul 2014 17:14:49 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up enum ni_660x_clock_source
These values are not used as an enum. For aesthetics, rename the
CamelCase values and convert them into defines.
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, 24 Jul 2014 17:14:48 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up enum ni_m_series_clock_source
These values are not used as an enum. For aesthetics, rename the
CamelCase values and convert them into defines.
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, 24 Jul 2014 17:14:47 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up enum ni_660x_gate_select
These values are not used as an enum. For aesthetics, rename the
CamelCase values and convert them into defines.
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, 24 Jul 2014 17:14:46 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up enum ni_m_series_gate_select
These values are not used as an enum. For aesthetics, rename the
CamelCase values and convert them into defines.
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, 24 Jul 2014 17:14:45 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up enum ni_660x_second_gate_select
These values are not used as an enum. For aesthetics, rename the
CamelCase values and convert them into defines.
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, 24 Jul 2014 17:14:44 +0000 (10:14 -0700)]
staging: comedi: ni_tio: remove counter_status_mask
For aesthetics, remove this global static const varaible.
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, 24 Jul 2014 17:14:43 +0000 (10:14 -0700)]
staging: comedi: ni_tio: convert global static const variables to defines
For aesthetics, convert the global static const varaibles into defines.
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, 24 Jul 2014 17:14:42 +0000 (10:14 -0700)]
staging: comedi: ni_tio: convert NI_660x_Up_Down_Pin_Second_Gate_Select() to a macro
The BUG_ON() in this function can never happen.
For aesthetics, rename this CamelCase inline function and convert it into
a simple macro.
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, 24 Jul 2014 17:14:41 +0000 (10:14 -0700)]
staging: comedi: ni_tio: convert NI_660x_RTSI_Second_Gate_Select() to a macro
The BUG_ON() in this function can never happen.
For aesthetics, rename this CamelCase inline function and convert it into
a simple macro.
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, 24 Jul 2014 17:14:40 +0000 (10:14 -0700)]
staging: comedi: ni_tio: convert NI_660x_RTSI_Clock() to a macro
The BUG_ON() in this function can never happen.
For aesthetics, rename this CamelCase inline function and convert it into
a simple macro.
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, 24 Jul 2014 17:14:39 +0000 (10:14 -0700)]
staging: comedi: ni_tio: convert NI_660x_Source_Pin_Clock() to a macro
The BUG_ON() in this function can never happen.
For aesthetics, rename this CamelCase inline function and convert it into
a simple macro.
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, 24 Jul 2014 17:14:38 +0000 (10:14 -0700)]
staging: comedi: ni_tio: convert NI_M_Series_PFI_Gate_Select() to a macro
The BUG_ON() in this function can never happen.
For aesthetics, rename this CamelCase inline function and convert it into
a simple macro.
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, 24 Jul 2014 17:14:37 +0000 (10:14 -0700)]
staging: comedi: ni_tio: convert NI_M_Series_RTSI_Gate_Select() to a macro
The BUG_ON() in this function can never happen.
For aesthetics, rename this CamelCase inline function and convert it into
a simple macro.
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, 24 Jul 2014 17:14:36 +0000 (10:14 -0700)]
staging: comedi: ni_tio: convert NI_660x_RTSI_Gate_Select() to a macro
The BUG_ON() in this function can never happen.
For aesthetics, rename this CamelCase inline function and convert it into
a simple macro.
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, 24 Jul 2014 17:14:35 +0000 (10:14 -0700)]
staging: comedi: ni_tio: convert NI_660x_Gate_Pin_Gate_Select() to a macro
The BUG_ON() in this function can never happen.
For aesthetics, rename this CamelCase inline function and convert it into
a simple macro.
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, 24 Jul 2014 17:14:34 +0000 (10:14 -0700)]
staging: comedi: ni_tio: convert NI_M_Series_PFI_Clock() to a macro
The BUG_ON() in this function can never happen.
For aesthetics, rename this CamelCase inline function and convert it into
a simple macro.
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, 24 Jul 2014 17:14:33 +0000 (10:14 -0700)]
staging: comedi: ni_tio: convert NI_M_Series_RTSI_Clock() to a macro
The BUG_ON() in this function can never happen.
For aesthetics, rename this CamelCase inline function and convert it into
a simple macro.
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, 24 Jul 2014 17:14:32 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up ni_660x_set_first_gate()
Rename some of the local vars and tidy up this function to fix to
fix a couple > 80 char line issues.
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, 24 Jul 2014 17:14:31 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up ni_m_series_set_first_gate()
Rename some of the local vars and tidy up this function to fix to
fix a couple > 80 char line issues.
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, 24 Jul 2014 17:14:30 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up ni_660x_set_second_gate()
Rename some of the local vars and tidy up this function to fix to
fix a couple > 80 char line issues.
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, 24 Jul 2014 17:14:29 +0000 (10:14 -0700)]
staging: comedi: ni_tio: remove unnecessary ni_gpct_variant BUG() cases
The enum ni_gpct_variant is used to handle hardware variations in the
gpct timers handled by this driver. This enum is defined as:
enum ni_gpct_variant {
ni_gpct_variant_e_series,
ni_gpct_variant_m_series,
ni_gpct_variant_660x
};
For all the switch statements where all three enum values are handled,
remove the unreachable BUG(). Move the default case so it is handled
the same as ni_gpct_variant_e_series.
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, 24 Jul 2014 17:14:28 +0000 (10:14 -0700)]
staging: comedi: ni_tio: tidy up some function declarations
Fix the whitespace in some of the function declarations to avoid
the ugly line breaks and fix a couple checkpatch.pl issues:
WARNING: line over 80 characters
WARNING: Unnecessary space before function pointer arguments
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, 24 Jul 2014 17:14:27 +0000 (10:14 -0700)]
staging: comedi: ni_tio: fix > 80 char comments
Tidy up some of the comments to fix some fo the the checkpatch.pl
warnings:
WARNING: line over 80 characters
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, 24 Jul 2014 17:14:26 +0000 (10:14 -0700)]
staging: comedi: ni_tio: fix ni_tio_insn_read()
The comedi core expects the (*insn_read) operations to read insn->n
values and return the number of values read.
Fix this function to work line the core expects.
For aesthetics, factor out the code that reads the SM_Save_Reg.
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>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:56 +0000 (20:51 +0100)]
staging: vt6656: rf.h clean up comments
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:55 +0000 (20:51 +0100)]
staging: vt6656: remove comments of old functions nolonger present.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:54 +0000 (20:51 +0100)]
staging: vt6656: remove return from all void functions
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:53 +0000 (20:51 +0100)]
staging: vt6656: main_usb.c remove return from void functions
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:52 +0000 (20:51 +0100)]
staging: vt6656: change driver version to mac80211
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:51 +0000 (20:51 +0100)]
staging: vt6656: main_usb.c remove comments to functions nolonger present.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:50 +0000 (20:51 +0100)]
staging: vt6656: rename device_alloc_bufs to vnt_alloc_bufs
changing device to vnt
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:49 +0000 (20:51 +0100)]
staging: vt6656: rename device_free_int_bufs to vnt_free_int_bufs
changing device to vnt
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:48 +0000 (20:51 +0100)]
staging: vt6656: rename device_free_rx_bufs to vnt_free_rx_bufs
changing vnt to device
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:47 +0000 (20:51 +0100)]
staging: vt6656: rename device_free_tx_bufs to vnt_free_tx_bufs
changing device to vnt
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:46 +0000 (20:51 +0100)]
staging: vt6656: rename device_init_registers to vnt_init_registers
changing device to vnt
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Fri, 25 Jul 2014 19:51:45 +0000 (20:51 +0100)]
staging: vt6656: rename device_set_options to vnt_set_options
changing device to vnt
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Zahari Doychev [Sun, 27 Jul 2014 08:26:40 +0000 (10:26 +0200)]
bcm: fix code style
this patch fixes some errors and warnings reported by checkpatch.pl
Signed-off-by: Zahari Doychev <zahari.doychev@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mostyn Bramley-Moore [Sat, 26 Jul 2014 12:49:58 +0000 (14:49 +0200)]
staging: netlogic: coding style fixup
Remove unnecessary return at end of a void function.
Part of the eudyptula challenge: http://eudyptula-challenge.org/
Signed-off-by: Mostyn Bramley-Moore <mbmcode@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Fri, 25 Jul 2014 17:55:10 +0000 (13:55 -0400)]
staging: unisys: fix visorchipset sysfs attribute functions
This patch cleans up the style, error handling, and string handling in the sysfs
functions recently added to visorchipset:
- Use of sscanf() was changed to type-appropriate kstrto*() functions
- error handling was simplified
- the error return value of visorchannel_write() was corrected
- switch use of driver-specific types to kernel types
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cihangir Akturk [Sun, 27 Jul 2014 00:21:15 +0000 (03:21 +0300)]
staging: gdm724x: fix misplaced open braces
This patch fixes the following checkpatch.pl issues in gdm_usb.c:
ERROR: that open brace { should be on the previous line
Signed-off-by: Cihangir Akturk <cakturk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jeff Oczek [Fri, 25 Jul 2014 00:19:43 +0000 (20:19 -0400)]
staging: rtl8188eu: Fix static symbol sparse warnings
Fix sparse warnings:
drivers/staging/rtl8188eu/core/rtw_cmd.c:52:5: warning:
symbol '_rtw_enqueue_cmd' was not declared. Should it be static?
drivers/staging/rtl8188eu/core/rtw_wlan_util.c:1225:5: warning:
symbol 'wifirate2_ratetbl_inx' was not declared. Should it be static?
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c:25:4: warning:
symbol 'ODM_GetRightChnlPlaceforIQK' was not declared. Should it be static?
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3109:5: warning:
symbol 'rtw_ioctl' was not declared. Should it be static?
Signed-off-by: Jeff Oczek <jeffoczek@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 20:13:20 +0000 (21:13 +0100)]
staging: vt6656: use test_bit to check flags status
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 20:13:19 +0000 (21:13 +0100)]
staging: vt6656: Remove unused macro MP_TEST_FLAGS
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 20:13:18 +0000 (21:13 +0100)]
staging: vt6656: use clear_bit to remove device flag
Replacing MP_CLEAR_FLAG
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 20:13:17 +0000 (21:13 +0100)]
staging: vt6656: use set_bit to set flags
Replacing MP_SET_FLAG
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 20:13:16 +0000 (21:13 +0100)]
staging: vt6656: struct vnt_private merge flag and macros
merge u32 flag into unsigned long Flags
Replacing fMP_DISCONNECTED with DEVICE_FLAGS_DISCONNECTED
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 20:13:15 +0000 (21:13 +0100)]
staging: vt6656: Remove unsed macro DEVICE_FLAGS_OPENED
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 20:13:14 +0000 (21:13 +0100)]
staging: vt6656: remove macro MP_IS_READY
Just test FLag and remove not.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 24 Jul 2014 20:13:13 +0000 (21:13 +0100)]
staging: vt6656: Remove flags fMP_POST_READS and fMP_POST_WRITES
MP_IS_READY(fMP_DISCONNECTED) is used to block thread in vnt_tx_context
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Igor Bezukh [Thu, 24 Jul 2014 18:45:03 +0000 (21:45 +0300)]
Staging: vt6655: remove redundant comments from bssdb.h
Removed redundant comments from bssdb.h header file.
Signed-off-by: Igor Bezukh <igbzkh@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Igor Bezukh [Thu, 24 Jul 2014 18:39:08 +0000 (21:39 +0300)]
Staging: vt6655: remove redundant comments from baseband.h
Removed redundant comments in baseband.h header file.
Signed-off-by: Igor Bezukh <igbzkh@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Thu, 24 Jul 2014 18:11:47 +0000 (14:11 -0400)]
staging: unisys: ABI documentation for new sysfs entries
This patch adds a documentation file for all of the interfaces that were moved
to sysfs by the other patches in this set.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Thu, 24 Jul 2014 18:08:44 +0000 (14:08 -0400)]
staging: unisys: clean up diagdump proc entry code
Remove remnant code left over from the diagdump proc entry.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Thu, 24 Jul 2014 18:08:43 +0000 (14:08 -0400)]
staging: unisys: move chipsetready to sysfs
Move the chipsetready proc entry to sysfs under a new directory guest. This
entry is used by Unisys application software on the guest to acknowledge
completion of specific events for integration purposes, but these
acknowledgements are not required for the guest to operate correctly.
The store function is simplified as well, to use scanf() instead of copying
the buffer and using strsep().
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Thu, 24 Jul 2014 18:08:42 +0000 (14:08 -0400)]
staging: unisys: move installer to sysfs and split fields
The installer entry in /proc/visorchipset/installer was composed of three
separate fields as one entry. This patch removes the proc entry and associated
functions, and creates new fields with distinct entries under sysfs in the
visorchipset/install directory. The fields are:
textid: used to send the ID of a string that should be displayed on
s-Par's automatic installation progress screen. Setting this
field when not in installation mode (boottotool was set on
the previous guest boot) has no effect.
remaining_steps: used to set the value of the progress bar on the
s-Par automatic installation progress screen. This field has
no effect if not in installation mode.
error: used to send the ID of a string that should be displayed on
s-Par's automatic installation progress screen when an error
is encountered during installation. This field has no effect
if not in installation mode.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Masanari Iida [Thu, 24 Jul 2014 10:46:52 +0000 (19:46 +0900)]
staging: et131x: Remove trailing semicolon from macros in et131x.h
This patch removes trailing semicolon from macros within et131x.h
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Masanari Iida [Thu, 24 Jul 2014 10:46:51 +0000 (19:46 +0900)]
staging: et131x: Fix typo in et131x
This patch fix spelling typos in comments and printk
within et131x.
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bernd Porr [Thu, 24 Jul 2014 13:34:32 +0000 (14:34 +0100)]
staging: comedi: usbduxfast: adding missing break in case statement
Added a missing "break" which forced the board to acquire 16
channels even when only 3 had been requested.
Thanks for Hartley Sweeten to spot this bug.
Signed-off-by: Bernd Porr <mail@berndporr.me.uk>
Reported-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Seunghun Lee [Thu, 24 Jul 2014 15:26:53 +0000 (00:26 +0900)]
staging: dgnc: Fix space required after that ','
This patch fixes checkpatch errors:
"space required after that ','"
Signed-off-by: Seunghun Lee <waydi1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Andrey Skvortsov [Thu, 24 Jul 2014 07:52:43 +0000 (11:52 +0400)]
staging: lustre: obdclass: fix sparse warnings about static declaration
Signed-off-by: Andrey Skvortsov <Andrej.Skvortzov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Wed, 23 Jul 2014 09:41:21 +0000 (10:41 +0100)]
staging: comedi: ni_65xx: disable edge detection on initialization
When the hardware is being initialized, the edge detection interrupts
are cleared and disabled. Also disable edge detection for all channels
at this time so they start off in a known state.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Wed, 23 Jul 2014 09:41:20 +0000 (10:41 +0100)]
staging: comedi: ni_65xx: support INSN_CONFIG_DIGITAL_TRIG
The "edge detection interrupt" subdevice supports the
`INSN_CONFIG_CHANGE_NOTIFY` comedi instruction which is only supported
by one other driver. It is limited to the first 32 channels, but boards
supported by this driver support edge detection on all digital I/O,
digital input and digital output channels. The
`INSN_CONFIG_DIGITAL_TRIG` comedi instruction is more flexible as it
supports more than 32 channels (with multiple instructions). It can
also support level detection, but the hardware does not support that.
Add partial support for the `INSN_CONFIG_DIGITAL_TRIG` instruction, but
only for edge detection.
Since `INSN_CONFIG_CHANGE_NOTIFY` can only deal with 32 channels, make
it disable edge detection for any remaining channels.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Wed, 23 Jul 2014 09:41:19 +0000 (10:41 +0100)]
staging: comedi: ni_65xx: refactor edge detection configuration
Refactor the code that updates the rising and falling edge detection
registers into new function `ni_65xx_update_edge_detection()`. This
updates the rising and falling edge detection registers for up to 32
channels starting at an arbitrary channel. Call it from the code that
handles the `INSN_CONFIG_CHANGE_NOTIFY` instruction, which is limited to
the first 32 channels.
(For the purposes of edge detection, the channels are in the natural
port order of the board, 8 channels per port. In practice, this is all
the digital I/O channels (if any), followed by all the digital input
channels (if any), followed by all the digital output channels (if any).
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Wed, 23 Jul 2014 09:41:18 +0000 (10:41 +0100)]
staging: comedi: ni_65xx: add ni_65xx_num_ports()
Add a function to return the total number of digital I/O, digital input,
and digital output ports on the board. Each port has 8 channels (bits).
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kristina Martšenko [Thu, 24 Jul 2014 18:58:46 +0000 (21:58 +0300)]
staging: quickstart: remove driver
The driver hasn't been cleaned up and it doesn't look like anyone is
working on it anymore (including the original author). So remove the
driver from the kernel. If someone wants to work on cleaning it up and
moving it out of staging, this commit can be reverted.
Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Cc: Angelo Arrifano <miknix@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kristina Martšenko [Thu, 24 Jul 2014 17:52:57 +0000 (20:52 +0300)]
staging: phison: remove driver
The driver hasn't been cleaned up and it doesn't look like anyone is
working on it anymore (including the original author). So remove the
driver from the kernel. If someone wants to work on cleaning it up and
moving it out of staging, this commit can be reverted.
Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Cc: Evan Ko <evan_ko@phison.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>