Ian Abbott [Tue, 9 Sep 2014 10:26:14 +0000 (11:26 +0100)]
staging: comedi: addi_apci_3xxx: replace comedi_board() calls
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Tue, 9 Sep 2014 10:26:13 +0000 (11:26 +0100)]
staging: comedi: addi_apci_3120: replace comedi_board() calls
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Tue, 9 Sep 2014 10:26:12 +0000 (11:26 +0100)]
staging: comedi: addi_apci_1516: replace comedi_board() calls
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Tue, 9 Sep 2014 10:26:11 +0000 (11:26 +0100)]
staging: comedi: addi_eeprom: replace comedi_board() calls
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Tue, 9 Sep 2014 10:26:10 +0000 (11:26 +0100)]
staging: comedi: addi_common: replace comedi_board() calls
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Thu, 11 Sep 2014 21:27:19 +0000 (14:27 -0700)]
Merge tag 'ipu-for-staging-3.18' of git://git.pengutronix.de/git/pza/linux into work-next
Philipp writes:
IPUv3 CPMEM API change across staging and drm
Eddie Kovsky [Mon, 8 Sep 2014 21:22:58 +0000 (15:22 -0600)]
staging: clean up checkpatch warnings in lustre
Silence checkpatch warning:
WARNING: type 'long long unsigned' should be specified in
[[un]signed] [short|int|long|long long] order
Signed-off-by: Eddie Kovsky <ewk@edkovsky.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Valdis Kletnieks [Mon, 8 Sep 2014 22:09:48 +0000 (18:09 -0400)]
staging/rtl8192u - check for skb alloc failure
It's possible for dev_alloc_skb() to fail. Propagate the error to the caller,
so it can clean up and drop the packet. The sender should end up retransmitting
the packet, hopefully at a time we're prepared to allocate skb's again.
Reported-By: Nicholas Krause <xerofoify@gmail.com>
Signed-Off-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Nitin Kuppelur [Mon, 8 Sep 2014 19:28:30 +0000 (21:28 +0200)]
Staging: octeon-hcd: removed unwanted return from void
This is a patch to the octeon-hcd.c file that fixes
checkpatch.pl warning by removing return statement from
void functions.
Signed-off-by: Nitin Kuppelur <nitinkuppelur@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:08:04 +0000 (16:38 +0530)]
staging: rtl8188eu: Remove HalPhyRf_8188e.c
Move functions from HalPhyRf_8188e.c to phy.c .
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:08:03 +0000 (16:38 +0530)]
staging: rtl8188eu: Remove HalPhyRf_8188e.h
Move macros and function declarations from HalPhyRf_8188e.h
to phy.h .
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:08:02 +0000 (16:38 +0530)]
staging: rtl8188eu: HalPhyRf_8188e.h :Remove unused function declaration
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:08:01 +0000 (16:38 +0530)]
staging: rtl8188eu: HalPhyRf_8188e.c: Remove unused functions
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:08:00 +0000 (16:38 +0530)]
staging: rtl8188eu: Rework function PHY_LCCalibrate_8188E()
Rename CamelCase local variables and function name.
Remove unnecessary debugging messages.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:59 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function PHY_LCCalibrate_8188E()
Rename CamelCase local variables and function name.
Remove unnecessary debugging messages.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:58 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function phy_LCCalibrate_8188E()
Rename CamelCase local variables and function name.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:57 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function phy_IQCalibrate_8188E()
Rename CamelCase local variables and function name.
Remove unnecessary debugging messages.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:56 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function phy_SimularityCompare_8188E()
Rename CamelCase local variables and function name.
Remove unnecessary debugging messages.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:55 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function _PHY_PIModeSwitch()
Rename CamelCase local variables and function name.
Remove unnecessary debugging messages and local variables.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:54 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function _PHY_PathAStandBy()
Rename CamelCase local variables and function name.
Remove unnecessary debugging messages and local variables.
Declare it as a static function.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:53 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function _PHY_MACSettingCalibration()
Rename CamelCase local variables and function name.
Remove unnecessary debugging messages and local variables.
Declare it as a static function.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:52 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function _PHY_PathADDAOn()
Rename CamelCase local variables and function name.
Remove unnecessary debugging messages and local variables.
Declare it as a static function.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:51 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function _PHY_ReloadMACRegisters()
Rename CamelCase local variables and function name.
Remove unnecessary debugging messages and local variables.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:50 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function reload_adda_reg()
Rename CamelCase local variables.
Remove unnecessary debugging messages and local variables.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:49 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function _PHY_SaveMACRegisters()
Rename CamelCase local variables and function name.
Remove unnecessary debugging messages and local variables.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:48 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function _PHY_SaveADDARegisters()
Rename CamelCase local variables and function name.
Remove unnecessary debugging messages and local variables.
Declare it as a static function.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:47 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function pathb_fill_iqk()
Rename CamelCase local variables.
Remove unnecessary debugging messages and local variables.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:46 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function patha_fill_iqk()
Rename CamelCase local variables.
Remove unnecessary debugging messages and local variables.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:45 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function phy_PathB_IQK_8188E()
Rename CamelCase function name and local variables.
Remove unnecessary debugging messages.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:44 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function phy_PathA_IQK_8188E()
Rename CamelCase function name and local variables.
Remove unnecessary debugging messages and local variables.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:43 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function phy_PathA_RxIQK()
Rename CamelCase function name and variables.
Remove unnecessary debugging messages.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:42 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework odm_TXPowerTrackingCallback_ThermalMeter_8188E()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:41 +0000 (16:37 +0530)]
staging: rtl8188eu: Rename function odm_TxPwrTrackSetPwr88E()
Rename CamelCase function name.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:40 +0000 (16:37 +0530)]
staging: rtl8188eu: Rework function ODM_TxPwrTrackAdjust88E()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
navin patidar [Sun, 7 Sep 2014 11:07:39 +0000 (16:37 +0530)]
staging: rtl8188eu: Rename function ODM_GetRightChnlPlaceforIQK()
Rename CamelCase function name.
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ilja Sidoroff [Mon, 8 Sep 2014 14:37:53 +0000 (17:37 +0300)]
Staging: wlan-ng: Remove redundant break/goto statements in hfa384x_usb.c
This patch removes redundant goto or break statements in hfa384x_usb.c as found by checkpatch.pl
Signed-off-by: Ilja Sidoroff <ilja.sidoroff@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Martin Kepplinger [Sun, 7 Sep 2014 14:12:30 +0000 (16:12 +0200)]
rtl8192u: remove typedef
remove a typedef that is not even really used.
Signed-off-by: Martin Kepplinger <martink@posteo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
SeeChen Ng [Sun, 7 Sep 2014 12:19:25 +0000 (20:19 +0800)]
staging: netlogic: fix checkpatch.pl "LINE_SPACING" issuses
Follow the checkpatch.pl "LINE_SPACING" indication:
1. Insert a blank line after function declaration.
2. Remove multiple blank lines.
Signed-off-by: SeeChen Ng <seechen81@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Donald [Sun, 7 Sep 2014 00:42:03 +0000 (19:42 -0500)]
drivers: staging: rtl8723au: Fix '"(foo*)" should be "(foo *)"' errors
Fix checkpatch.pl '"(foo*)" should be "(foo *)"' errors
Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Donald [Sat, 6 Sep 2014 23:40:29 +0000 (18:40 -0500)]
drivers: staging: rtl8821ae: Fix '"(foo*)" should be "(foo *)"' errors
Fix checkpatch.pl '"(foo*)" should be "(foo *)"' errors
Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Omar Sandoval [Sat, 6 Sep 2014 08:59:37 +0000 (01:59 -0700)]
staging: bcm: sort.c: fix coding style
Fix checkpatch.pl "Alignment should match open parenthesis".
Signed-off-by: Omar Sandoval <osandov@osandov.com>
Reviewed-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 4 Sep 2014 22:08:37 +0000 (23:08 +0100)]
staging: vt6656: remove rate_control_algorithm pid
rate control algorithm pid was removed from wireless tree
The device defaults to algorithm 'minstrel_ht'
There has been no problems using this algorithm.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Thu, 4 Sep 2014 22:08:36 +0000 (23:08 +0100)]
staging: vt6655: device_free_info() warn: variable dereferenced before check
pDevice is never NULL when this function is called remove the check.
This fixes smatch warning
drivers/staging/vt6655/device_main.c:1023 device_free_info() warn: variable dereferenced
before check 'pDevice' (see line 1021)
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: kbuild@01.org
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Paul Bolle [Fri, 5 Sep 2014 11:28:01 +0000 (13:28 +0200)]
staging: gs_fpgaboot: remove checks for CONFIG_B4860G100
There are two checks for CONFIG_B4860G100 in this driver. But there's no
Kconfig symbol B4860G100. These checks will always evaluate to false.
Remove them and the code they hide.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Donald [Thu, 4 Sep 2014 21:01:04 +0000 (16:01 -0500)]
drivers: staging: rtl8821ae: Fix "space required before that '*'" errors
Fix checkpatch.pl "space required before that '*'" errors
Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Donald [Thu, 4 Sep 2014 20:49:30 +0000 (15:49 -0500)]
drivers: staging: rtl8723au: Fix "space required before that '*'" errors
Fix checkpatch.pl "space required before that '*'" errors
Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Donald [Thu, 4 Sep 2014 20:37:41 +0000 (15:37 -0500)]
drivers: staging: rtl8192u: Fix "space required before that '*'" errors
Fix checkpatch.pl "space required before that '*'" errors
Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Fri, 5 Sep 2014 09:53:06 +0000 (12:53 +0300)]
staging: xillybus: Removed unnecessary cast
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:57 +0000 (17:47 +0300)]
staging: xillybus: Blank lines add/remove
* Blank lines between a function call and its return status check were
removed.
* Double blank lines were removed.
* Blank lines were added and removed as to silence checkpatch.pl --strict
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:56 +0000 (17:47 +0300)]
staging: xillybus: Fix indentations
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:55 +0000 (17:47 +0300)]
staging: xillybus: Trivial coding style fixes
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:54 +0000 (17:47 +0300)]
staging: xillybus: Reorganize line breaks for clarity
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:52 +0000 (17:47 +0300)]
staging: xillybus: Fix comments
Trivial comments removed, and one comment clarified
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:51 +0000 (17:47 +0300)]
staging: xillybus: Added curly brackets as required
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:50 +0000 (17:47 +0300)]
staging: xillybus: Clarified the stop condition for a loop
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:49 +0000 (17:47 +0300)]
staging: xillybus: Use the return value of wait_event_interruptible
Rather than checking the wait condition, the return value of
wait_event_interruptible() and wait_event_interruptible_timeout() is
used.
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:48 +0000 (17:47 +0300)]
staging: xillybus: Fixes related to "rc" variable
"rc" is often used to hold the return value of a function call. This patch
removes unnecessary assignments to this variable, and makes a few related
execution flow improvements.
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:47 +0000 (17:47 +0300)]
staging: xillybus: EAGAIN status handling improvement
The -EAGAIN status is passed through an "rc" variable instead of a less
common flow.
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:46 +0000 (17:47 +0300)]
staging: xillybus: Improved goto flow for error handling
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:45 +0000 (17:47 +0300)]
staging: xillybus: Improved error handling
xilly_scan_idt() now returns an error status code, rather than being a void
function and hint the status through an entry in a data structure.
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:44 +0000 (17:47 +0300)]
staging: xillybus: Removed unnecessary error message
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:43 +0000 (17:47 +0300)]
staging: xillybus: Removed unnecessary warning message
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:42 +0000 (17:47 +0300)]
staging: xillybus: Non-interruptible mutex_lock() on release method
Responding to an interrupt while handling the "release" method can't end
well anyhow. In practical cases, this can force the user to wait up to
one second while flushing remaining data is attempted (a timeout on the flush
mechanism limits the time for flushing).
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:41 +0000 (17:47 +0300)]
staging: xillybus: Use SEEK_* predefined constants
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Thu, 4 Sep 2014 14:47:40 +0000 (17:47 +0300)]
staging: xillybus: Use devm_kcalloc() for arrays
Replace devm_kzalloc where it applies.
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:51 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: move analog input (*insn_read) function
For aesthetics, move the analog input (*insn_read) function so it
is not located in the middle of the async command support functions.
Also, rename it for consistency.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:50 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: tidy up some wordy comments
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:49 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: no need to reset ai FIFO after (*insn_read)
The analog input FIFO is reset at the start of every (*insn_read) and (*do_cmd)
operation. It's also reset for the analog input (*cancel).
There's no reason to reset the FIFO if an (*insn_read) times out or after
all the samples have been acquired.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:48 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: introduce pci9118_amcc_setup_dma()
Introduce a helper function to program the AMCC master write address and
transfer count registers to setup a DMA transaction.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:47 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: introduce pci9118_amcc_dma_ena()
Introduce a helper function to program the AMCC master control/status
register to enable/disable dma.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:46 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: introduce pci9118_amcc_int_ena()
Introduce a helper function to program the AMCC interrupt control/
status register to enable/disable interrupts.
Fix the analog input (*cancel). The analog input async command support
is the only interrupt generator. The (*cancel) should always disable
interrupts.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:45 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: rename 'IntControlReg'
Rename this CamelCase member of 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>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:44 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: rename 'AdControlReg'
Rename this CamelCase member of 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>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:43 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: rename 'AdFunctionReg'
Rename this CamelCase member of 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>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:42 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: fix ai range/aref programming
Currently the analog input range and aref are set in setup_channel_list().
This works for the (*insn_read) but the (*do_cmd) has a problem.
In (*do_cmd) the ai control register is reset to 0 before the function works
out the bits needed to control the acquisition. This happens after the
setup_channel_list() call so the range is reset to bipolar and the aref to
single-ended.
Introduce a helper function, pci9118_ai_set_range_aref(), to handle the
programming of the range and aref bits. This function first clears the
cached value of the ai control register in the private data then sets the
appropriate bits. The (*insn_read) and (*do_cmd) can then set the other
bits needed to control the acquisition.
Then setup_channel_list() just needs to program the chanlist scan 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>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:41 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: ai (*insn_read) does not use interrupts
The analog input (*insn_read) in this driver is done as a software-triggered,
polled operation. The PCI9118_AI_CTRL_INT bit in the control register, which
is actually set in setup_channel_list(), should not be set.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:40 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: cleanup and simplify pci9118_reset()
Change the return type to void, this function always succeeds and the
callers never check the return value.
According to the The User Manual for the PCI-9118, the hardware does not
require any particular "reset" in order to function. Simplify the reset
so it justs gets the board info a known state with interrupts disabled.
There is no reason to initialize the private data members in this function.
They all default to '0' due to the kzalloc() of the private data and the
subdevice operations all initialize them as needed.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:39 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: move analog output (*insn_write) function
For aesthetics, move the analog output (*insn_write) function so it
is not located in the middle of the analog input functions. Also,
rename it for consistency.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:38 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: use comedi_subdevice 'readback'
Use the new comedi_subdevice 'readback' member and the core provided
(*insn_read) for the readback of the analog output subdevice channels.
The board is "reset" prior to the subdevice init. Part of this reset
sets all the analog output channels to 0V. Move the initialization of
the 'readback' values after the 'readback' member has been allocated.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:37 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: move digitial input (*insn_bits) function
For aesthetics, move the digital inputs (*insn_bits) function so it
is not located in the middle of the analog input functions. Also,
rename it for consistency.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:36 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: don't reset digital outputs
Currently this driver resets the digital output channels to a low state
when the driver is attached and detached.
Since the digital output state can be read, initialize the subdevice
state when the driver is attached and don't reset them.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Fri, 5 Sep 2014 16:25:35 +0000 (09:25 -0700)]
staging: comedi: adl_pci9118: move digitial output (*insn_bits) function
For aesthetics, move the digital outputs (*insn_bits) function so it
is not located in the middle of the analog input functions. Also,
rename it for consistency.
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, 4 Sep 2014 19:14:27 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: tidy up the interrupt control/status bit defines
Rename the CamelCase defines used for the interrupt control/status register
bits and convert them to bit shifts.
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, 4 Sep 2014 19:14:26 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: tidy up the interrupt control/status register
The register at offset 0x38 is the "interrupt control" register when written
and the "interrupt status" register when read. Both registers use the same
bit defines.
For aesthetics, use a common define for 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>
H Hartley Sweeten [Thu, 4 Sep 2014 19:14:25 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: introduce pci9118_ai_reset_fifo()
Introduce a helper function to reset the analog input FIFO. For
aesthetics, rename the register used to reset the FIFO.
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, 4 Sep 2014 19:14:24 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: tidy up the ai config register bit defines
Rename the CamelCase defines used for the analog input config register
bits and convert them to bit shifts.
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, 4 Sep 2014 19:14:23 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: rename PCI9118_ADFUNC define
For aesthetics, rename this define used for the analog input function
config 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>
H Hartley Sweeten [Thu, 4 Sep 2014 19:14:22 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: rename PCI9118_SCANMOD define
For aesthetics, rename this define used for the analog input auto scan
mode 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>
H Hartley Sweeten [Thu, 4 Sep 2014 19:14:21 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: rename PCI9118_BURST define
For aesthetics, rename this define used for the analog input burst
number 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>
H Hartley Sweeten [Thu, 4 Sep 2014 19:14:20 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: rename PCI9118_GAIN define
For aesthetics, rename this define used for the analog input chanlist
programming 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>
H Hartley Sweeten [Thu, 4 Sep 2014 19:14:19 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: introduce pci9118_ai_start_conv()
Writing any value to the "software trigger" register generates a trigger
pulse to start an A/D conversion. Introduce a helper function to clarify
this. For aesthetics, rename the define used for the register.
According to the datasheet the extra delay is not needed after starting
the conversion. Remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 4 Sep 2014 19:14:18 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: clarify the digital I/O register
The same register is used for both the digital inputs and outputs.
Reading the register returns the state of the 4 digtial input channels
and the 4 digital output channels. Writing to the register updates the
digital outputs.
Add some comments to clarify this and use a single define for the 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>
H Hartley Sweeten [Thu, 4 Sep 2014 19:14:17 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: tidy up the ai control register bit defines
Rename the CamelCase defines used for the analog input control register
bits and convert them to bit shifts.
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, 4 Sep 2014 19:14:16 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: rename PCI9118_ADCNTRL define
For aesthetics, rename this define used for the analog input control
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>
H Hartley Sweeten [Thu, 4 Sep 2014 19:14:15 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: tidy up the ai status register bit defines
Rename the CamelCase defines used for the analog input status register
bits and convert them to bit shifts.
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, 4 Sep 2014 19:14:14 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: rename PCI9118_ADSTAT define
For aesthetics, rename this define used for the analog input status
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>
H Hartley Sweeten [Thu, 4 Sep 2014 19:14:13 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: tidy up analog output register defines
Replace the current defines with a macro that calculates the correct
register offset based on the channel.
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, 4 Sep 2014 19:14:12 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: tidy up analog input fifo register define
For aesthetics, rename the define used for the analog input fifo register
and tidy up its use in 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>
H Hartley Sweeten [Thu, 4 Sep 2014 19:14:11 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: introduce pci9118_timer_set_mode()
This driver uses 32-bit instructions to write the 8254 timers so we
can't use the helper functions provided by 8253.h.
To clarify the code introduce a helper function to set the timer mode.
Remove the unnecessary commented out timer mode programming.
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, 4 Sep 2014 19:14:10 +0000 (12:14 -0700)]
staging: comedi: adl_pci9118: introduce pci9118_timer_write()
This driver uses 32-bit instructions to write the 8254 timers so we
can't use the helper functions provided by 8253.h.
To clarify the code introduce a helper function to write to the timers.
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>
projects / platform / kernel / linux-starfive.git / log