Commit graph

458052 commits

Author SHA1 Message Date
Guillaume Clement a1613423cd 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>
2014-07-27 11:21:28 -07:00
Guillaume Clement 941ead9adf 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>
2014-07-27 11:21:28 -07:00
Guillaume Clement 5f742c7b98 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>
2014-07-27 11:21:27 -07:00
Guillaume Clement b69ee55b4c 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>
2014-07-27 11:21:27 -07:00
Guillaume Clement 84b5076207 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>
2014-07-27 11:21:27 -07:00
Guillaume Clement bfd7a28190 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>
2014-07-27 11:21:27 -07:00
Guillaume Clement 6b7112719f 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>
2014-07-27 11:21:27 -07:00
Guillaume Clement fe802546ce 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>
2014-07-27 11:21:27 -07:00
Malcolm Priestley 7a3391764f 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>
2014-07-27 11:19:57 -07:00
Malcolm Priestley 4a36a96620 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>
2014-07-27 11:19:57 -07:00
Malcolm Priestley f777203a8c staging: vt6656: power.h remove dead macros
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-27 11:19:57 -07:00
Malcolm Priestley 23690634a5 staging: vt6656: dpc remove unneeded headers
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-27 11:19:57 -07:00
Malcolm Priestley 52e0cdc546 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>
2014-07-27 11:19:57 -07:00
H Hartley Sweeten 0748e36265 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>
2014-07-27 11:16:49 -07:00
H Hartley Sweeten 099286dc30 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>
2014-07-27 11:16:49 -07:00
H Hartley Sweeten 3e90b1c7eb 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>
2014-07-27 11:16:49 -07:00
H Hartley Sweeten f68d10c428 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>
2014-07-27 11:16:49 -07:00
H Hartley Sweeten 7d9e68d3f4 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>
2014-07-27 11:16:49 -07:00
H Hartley Sweeten d54bb5a7f7 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten bf4ec095b3 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten d00193be1f 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten 704c6dbaa9 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten f6e2278326 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten 463daa7f18 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten 99065954d1 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten dba0f57f88 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten 25e529b0f4 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten 8477c5d4ba 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten 9ff506ec11 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten b8e58af6da 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten c93a740686 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>
2014-07-27 11:16:48 -07:00
H Hartley Sweeten 5a3d1ed857 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten 390db7a30e 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten 7e3e759163 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten 01ca8f978b 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten eca7d87201 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten e04460a650 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten ff9a986115 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten 288cb1a87c 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten cdf4fce421 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten 03c7867123 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten cfd5fed200 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten 5f8c74429a 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten 72f4202f1f 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>
2014-07-27 11:16:47 -07:00
H Hartley Sweeten 1649d56d92 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>
2014-07-27 11:16:46 -07:00
H Hartley Sweeten 9f9d6446b3 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>
2014-07-27 11:16:46 -07:00
H Hartley Sweeten e09dd2c3c5 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>
2014-07-27 11:16:46 -07:00
H Hartley Sweeten 7d2a6e548e 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>
2014-07-27 11:16:46 -07:00
H Hartley Sweeten 5520505327 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>
2014-07-27 11:16:46 -07:00
H Hartley Sweeten 856031614e 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>
2014-07-27 11:16:46 -07:00