OSDN Git Service
Daeseok Youn [Tue, 3 Jun 2014 08:01:31 +0000 (17:01 +0900)]
staging: dgap: pass "brd" as a paramter to dgap_after_config_loaded()
Pass "brd" to dgap_after_config_loaded() instead of passing
"dgap_numboards" and looking up brd again.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Tue, 3 Jun 2014 06:26:53 +0000 (15:26 +0900)]
staging: dgap: pass "dgap_numboards" as a paramter to dgap_found_board()
- Pass "dgap_numboards" to dgap_found_board() instead of
using a global variable.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Mon, 2 Jun 2014 05:09:04 +0000 (14:09 +0900)]
staging: dgap: make dgap_config_buf a local buffer
The dgap_config_buf is only used in dgap_firmware_load().
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Mon, 2 Jun 2014 05:08:24 +0000 (14:08 +0900)]
staging: dgap: unwind on error in dgap_tty_register_ports()
- The dgap_tty_register_ports() needs to handle if the
tty_port_register_device() fails.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Mon, 2 Jun 2014 05:07:46 +0000 (14:07 +0900)]
staging: dgap: unwind on error in dgap_tty_init()
If the kzalloc() fails for channels, it need to handle
that error. It should free channels which were already
allocated.
And also removes the call to dgap_tty_uninit() in
dgap_firmware_load().
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Mon, 2 Jun 2014 05:06:53 +0000 (14:06 +0900)]
staging: dgap: remove bogus null test in dgap_tty_init()
- The channels array were set to NULL in dgap_found_board().
- Removes redundant null check for channels array in for loop,
if one of the channel cannot be allocated, dgap_tty_init() just returns
an error.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Thu, 29 May 2014 09:11:09 +0000 (18:11 +0900)]
staging: dgap: unwind on error in dgap_found_board()
Adds a label for "kfree(brd)". And also remove
a state value as BOARD_FAILED in brd when dgap_do_remap() is failed.
Because "brd" will free after failure.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Thu, 29 May 2014 09:10:27 +0000 (18:10 +0900)]
staging: dgap: remove useless dgap_probe1() function
The dgap_probe1() function is just calling dgap_found_board().
So it is removed and dgap_found_board() is called directly.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rickard Strandqvist [Sun, 15 Jun 2014 15:14:06 +0000 (17:14 +0200)]
staging: rtl8192u: r8192U_core.c: Cleaning up unclear and confusing code
Removes confusing and unclear code.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaitanya Hazarey [Wed, 11 Jun 2014 17:26:44 +0000 (10:26 -0700)]
Staging: rtl8192u: r8192U_core.c Converted a C99 comment to fix code-style error
Converted a C99 comment to fix the following error:
ERROR: trailing statements should be on next line
Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaitanya Hazarey [Wed, 11 Jun 2014 17:26:43 +0000 (10:26 -0700)]
Staging: rtl8192u: r8192U_core.c Fixed open brace { placement
Fixed open brace placement to address the following code-style errors:
ERROR: that open brace { should be on the previous line
Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaitanya Hazarey [Thu, 5 Jun 2014 20:25:58 +0000 (13:25 -0700)]
Staging: rtl8192u: r8192U_core.c Converted some C99 comments to fix code-style errors
Converted some C99 warnings to fix the following error:
ERROR: trailing statements should be on next line
Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaitanya Hazarey [Thu, 5 Jun 2014 20:25:57 +0000 (13:25 -0700)]
Staging: rtl8192u: r8192U_core.c Rearranged statements to fix code-style errors
Rearranged statements around if and switch statements to address the following error:
ERROR: trailing statements should be on next line
Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaitanya Hazarey [Thu, 5 Jun 2014 20:25:56 +0000 (13:25 -0700)]
Staging: rtl8192u: r8192U_core.c Added a space after ','
Added spaces after ',' to fix the following warning:
ERROR: space required after that ',' (ctx:VxV)
Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaitanya Hazarey [Mon, 2 Jun 2014 16:11:45 +0000 (09:11 -0700)]
Staging: rtl8192u: r8192U_wx.c Removed some more commented out dead code
Removed dead code from the file.
Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Paul Bolle [Fri, 30 May 2014 12:52:18 +0000 (14:52 +0200)]
staging: rtl8192u: remove checks for CONFIG_IEEE80211_CRYPT_TKIP
Ever since rtl8192u was added as a staging driver in v2.6.33 it contained
checks for CONFIG_IEEE80211_CRYPT_TKIP. But the Kconfig symbol
IEEE80211_CRYPT_TKIP was renamed to LIB80211_CRYPT_TKIP in v2.6.29. So
these checks have always evaluated to false. And these checks were rather
odd to begin with, since rtl8192u comes with its own ieee80211 stack,
which has support for TKIP built in.
Now the safe and easy thing to do here would be to remove these checks
and the code they hide. But it turns out that with some minor cleanup
the code currently hidden behind these checks builds cleanly. And by
building it we allow the people actually running this code to test
whether it is any good.
That minor cleanup is needed because ieee80211_encrypt_fragment()
accesses struct sk_buff's data member as if it is a struct
ieee80211_hdr. It's not. See, in ieee80211_xmit() a struct
ieee80211_hdr_3addrqos is skb_put() into the sk_buff with which
ieee80211_encrypt_fragment() will be called. So switch from
ieee80211_hdr to ieee80211_hdr_3addrqos here.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaitanya Hazarey [Thu, 29 May 2014 20:45:20 +0000 (13:45 -0700)]
Staging: rtl8192u: r8192U_wx.c Added a single space for code-style issue
Added a space around '|' to address:
ERROR: need consistent spacing around '|' (ctx:VxW)
Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaitanya Hazarey [Thu, 29 May 2014 20:45:19 +0000 (13:45 -0700)]
Staging: rtl8192u: r8192U_wx.c Removed all C99 comments
To address the error -
ERROR: do not use C99 // comments
Removed all C99 comments.
Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaitanya Hazarey [Thu, 29 May 2014 20:45:18 +0000 (13:45 -0700)]
Staging: rtl8192u: r8192U_wx.c removed commented dead code
Removed dead code, commented out printks and DMESG.
Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Magnus Damm [Fri, 6 Jun 2014 10:44:52 +0000 (19:44 +0900)]
staging: board: kzm9d: Board staging support for emxx_udc
Add staging board support for the KZM9D board and add
an emxx_udc platform device to allow in-tree continous
development of the driver on the KZM9D board.
When DT bindings are ready for the emxx_udc driver then
the platform device in the KZM9D staging board code can
easily be removed. Until then we use platform devices
to continously improve the driver and integration code.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Magnus Damm [Fri, 6 Jun 2014 10:44:43 +0000 (19:44 +0900)]
staging: board: Initial board staging support
Add staging board base support to allow continuous upstream
in-tree development and integration of platform devices.
Helps developers integrate devices as platform devices for
device drivers that only provide platform device bindings.
This in turn allows for incremental development of both
hardware feature support and DT binding work in parallel.
Two separate pieces of board staging functionality is
provided to ease per-board staging board support:
- The board_staging() macro allows easy per-board callbacks
- The board_staging_dt_node_available() provides DT node checking
Tested on the KZM9D board with the emxx_udc staging driver.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Magnus Damm [Fri, 6 Jun 2014 10:44:35 +0000 (19:44 +0900)]
staging: emxx_udc: Add TODO file
Add a TODO file for emxx_udc to show what is left to do.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Magnus Damm [Fri, 6 Jun 2014 10:44:26 +0000 (19:44 +0900)]
staging: emxx_udc: I/O memory and IRQ resource support
Adjust the emxx_udc driver to make use of the standard
driver model to pass I/O memory and IRQ as resources
instead of hard coding those things in the driver.
Needs more work - the VBUS signal is yet not handled.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Magnus Damm [Fri, 6 Jun 2014 10:44:17 +0000 (19:44 +0900)]
staging: emxx_udc: Add Emma Mobile USB Gadget driver
Add the emxx_udc driver to staging based on an old linux-2.6.35.7
android tree. The driver has been brushed up slightly to complile
but it is still in great need of cleanup.
At this point DT bindings are clearly lacking and I doubt that the
driver even can run with multiple instances (global variables, hurray!).
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Thu, 19 Jun 2014 20:18:06 +0000 (13:18 -0700)]
Revert "staging: tidspbridge: use safer test on the result of find_first_zero_bit"
This reverts commit
cc0be81f00472d782804293766ddd9d1c2b4ebd1, it was
incorrect.
Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 19 Jun 2014 17:20:37 +0000 (10:20 -0700)]
staging: comedi: ni_stc.h: remove stc read/write callbacks from ni_private
The drivers that include ni_mio_common.c set the stc register read/write
callbacks to private functions that handle the read/write operations in
the correct manner for the hardware.
The ni_atmio and ni_mio_cs drivers use identical code to handle the
operations.
The ni_pcimio driver is a bit different due to the non-windowed setup
of the stc registers on the m series boards. For the other boards
supported by the ni_pcimio driver, the direct access of the first 8
STC registers is also disabled due to a difference on the 611x devices.
These differences can all be handled in the ni_stc_{read,write}[lw]()
helpers. Refactor the helpers and remove the callbacks from the private
data.
Also, move the helper functions the handle the mapping of the windowed
STC register offsets to M series register offset from ni_pcimio.c to
ni_mio_common.c.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 19 Jun 2014 17:20:36 +0000 (10:20 -0700)]
staging: comedi: ni_stc.h: remove read/write callbacks from ni_private
The drivers that include ni_mio_common.c set the read/write callbacks
to private functions that handle the read/write operations in the
correct manner for the hardware. The ni_atmio and ni_mio_cs drivers
use ioport register access and the ni_pcimio driver uses memory mapped
register access. The memory mapped base address is stored in the 'mite'
pointer in the private data which is only allocated and initialized by
the ni_pcimio driver.
Detect the need for memory mapped register access by checking if the
'mite' pointer is set in the private data and remove the callbacks
from the private data.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 19 Jun 2014 17:20:35 +0000 (10:20 -0700)]
staging: comedi: ni_mio_common.c: wrap the read/write operations
The ni_atmio, ni_pcimio, and ni_mio_cs drivers all include this source
file to handle the common functionality of the drivers. Each of those
drivers set some function pointers in the private data to handle the
read/write operations to the normal registers.
Like done for the stc register operations, wrap these operations with
some helper functions to clarify the code a bit and make it easier to
read and maintain.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 19 Jun 2014 17:20:34 +0000 (10:20 -0700)]
staging: comedi: ni_mio_common.c: wrap the stc_read/write operations
The ni_atmio, ni_pcimio, and ni_mio_cs drivers all include this source
file to handle the common functionality of the drivers. Each of those
drivers set some function pointers in the private data to handle the
read/write operations to the stc registers.
Wrap these operations with some helper functions to clarify the code
a bit and make it easier to read and maintain.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 19 Jun 2014 17:20:33 +0000 (10:20 -0700)]
staging: comedi: ni_stc.h: cleanup ni_e_series_enable_second_irq()
This function is used to enable/disable the second irq on NI e-series
boards. This irq used used to generate dma requests for the counters.
There are only 2 counters (NUM_GPCT) so the default case of the switch
can never occur.
Tidy up this function and remove the unreachable BUG().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 19 Jun 2014 17:20:32 +0000 (10:20 -0700)]
staging: comedi: ni_stc.h: add a 'is_m_series' flag to private data
The (board->reg_type & ni_reg_m_series_mask) test is commonly used
in ni_mio_common.c to detect if the driver is being used with a
National Instruments "M series" DAQ board. Simplify the code a bit
by adding an 'is_m_series' bit-field flag to the private data.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:35 +0000 (11:37 +0200)]
staging: rtl8723au: Eliminate last rtw_get_beacon_interval*() usage
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:34 +0000 (11:37 +0200)]
staging: rtl8723au: Remove last users of rtw_get_capability*() functions
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:33 +0000 (11:37 +0200)]
staging: rtl8723au: rtw_get_bcn_info23a(): Use __func__ in debug prints
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:32 +0000 (11:37 +0200)]
staging: rtl8723au: rtw_get_bcn_info23a(): Use capability from wlan_bssid_ex
This eliminates yet another user of rtw_get_capability23a_from_ie()
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:31 +0000 (11:37 +0200)]
staging: rtl8723au: issue_assocreq(): Use struct ieee80211_mgmt to build assoc_req frame
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:30 +0000 (11:37 +0200)]
staging: rtl8723au: issue_assocrsp(): Use capability from struct wlan_bssid_ex
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:29 +0000 (11:37 +0200)]
staging: rtl8723au: issue_probersp(): Do not copy the IEs in front of probe_resp data
Another case where the driver was copying IEs in front of the
probe_resp data in the management frame, when running in AP mode. This
would result in badly corrupted frames hitting the wire - ouf ouf ouf!
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:28 +0000 (11:37 +0200)]
staging: rtl8723au: issue_beacon23a(): Use struct ieee80211_mgmt to build beacon
Why on Earth we have two functions in the driver constructing beacon
frames is beyond me ... but one step at a time
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:27 +0000 (11:37 +0200)]
staging: rtl8723au: issue_beacon23a(): Do not copy IEs in front of beacon data
Not sure how this happened, but one should never copy the IEs in front
of the beacon frame info. This could lead to some nasty corrupted
beacon frames hitting the wire if running AP mode - ouf!
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:26 +0000 (11:37 +0200)]
staging: rtl8723au: ConstructBeacon(): Use struct ieee80211_mgmt to build beacon
This gets rid of a bunch of hard coded offsets and reduces the
dependency of the ugly rtw_get_*_from_ie() functions.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:25 +0000 (11:37 +0200)]
staging: rtl8723au: is_same_network23a(): Use the capability info from wlan_bssid_ex
We already have the capability info in struct wlan_bssid_ex, no point
in searching for it once again.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:24 +0000 (11:37 +0200)]
staging: rtl8723au: Update bss beacon info in rtw_add_beacon()
Pull out the core info beacon_interval, capability, and tsf and update
cur_network.network with the info in rtw_add_beacon() instead of
relying on it being in ->IEs.
This will help later when getting rid of the beacon struct info from
->IEs and only carrying the actual IEs there.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:23 +0000 (11:37 +0200)]
staging: rtl8723au: rtw_add_beacon(): Replace magic constant with appropriate struct size
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:22 +0000 (11:37 +0200)]
staging: rtl8723au: struct wlan_bssid_ex: Rename BeaconPeriod to beacon_interval
This is to be more consistent mapping the names in wlan_bssid_ex to
those in struct ieee80211_mgmt.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:21 +0000 (11:37 +0200)]
staging: rtl8723au: rtw_cfg80211_inform_bss(): Use the capability info we already saved
No point in pulling capability info out of the IE array when it's
already stored in struct wlan_bssid_ex
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:20 +0000 (11:37 +0200)]
staging: rtl8723au: collect_bss_info(): Save capability in struct wlan_bssid_ex
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:19 +0000 (11:37 +0200)]
staging: rtl8723au: rtw_cfg80211_inform_bss(): Report the beacon interval already retrieved
Use the beacon interval we already retreived in collect_bss_info()
instead of pulling it out of the saved IE array again.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:18 +0000 (11:37 +0200)]
staging: rtl8723au: Save timestamp for network in collect_bss_info() and report it to the stack
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:17 +0000 (11:37 +0200)]
staging: rtl8723au: rtw_cfg80211_inform_bss(): Use cfg80211_inform_bss()
There is no point in creating a fake beacon frame to call
cfg80211_inform_bss_frame() when we can just call
cfg80211_inform_bss() with the parameters we were sticking into the
fake frame.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Thu, 19 Jun 2014 09:37:16 +0000 (11:37 +0200)]
staging: rtl8723au: rtw_cfg80211_inform_bss(): timestamp isn't used
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Thu, 19 Jun 2014 03:02:33 +0000 (20:02 -0700)]
Merge tag 'iio-for-3.17a' of git://git./linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
First round of new drivers, cleanups and functionality for the 3.17 cycle.
New drivers
* t5403 barometric pressure sensor
* kxcjk1013 accelerometer (with a locking followup fix).
* ak09911 digital compass
Documentation
* ABI docs for proximity added (interface has been there a long time but
somehow snuck through without being documented)
* Move iio-trig-sysfs documentation out of staging (got left behind when
the driver moved some time ago).
Cleanups
* drop the timestamp argument from iio_trigger_poll(_chained) as
nothing has been done with it for some time.
* ad799x kerneldoc for ad799x_chip brought up to date.
* replace a number of reimplementations of the GENMASK macro and
use the BIT macro to cleanup a few locations.
* bring the iio_event_monitor example program up to date with new
device types.
* fix some incorrect function prototypes in iio_utils.h example code.
* INDIO_RING_TRIGGERED to INDIO_BUFFER_TRIGGERED fix in docs. This
got left behind after we renamed it a long time back.
* fix error handling in the generic_buffer example program.
* small tidy ups in the iio-trig-periodic-rtc driver.
* Allow reseting iio-trig-periodic-rtc frequency to 0 (default) after
it has changed.
* Trivial tidy ups in coding style in iio_simply_dummy
Anil Belur [Wed, 18 Jun 2014 08:23:56 +0000 (18:23 +1000)]
staging: lustre: lclient: lcommon_cl.c fixing coding style issues
fixed: WARNING: suspect code indent for conditional statements (32, 32)
Signed-off-by: Anil Belur <askb23@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anil Belur [Wed, 18 Jun 2014 08:23:55 +0000 (18:23 +1000)]
staging: lustre: lclient: lcommon_cl.c fixing coding style issues
fixed: WARNING: line over 80 characters, used a new variable 'size_index' to
store the offset. Replaced "unsigned long" with "loff_t" type for
'cur_index'. Removed the parenthesis around the second part of the if statement following the '||' as its not required.
Signed-off-by: Anil Belur <askb23@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anil Belur [Wed, 18 Jun 2014 08:23:54 +0000 (18:23 +1000)]
staging: lustre: lclient: lcommon_cl.c fixing coding style issues
fixed: ERROR: inline keyword should sit between storage class and type
Signed-off-by: Anil Belur <askb23@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anil Belur [Wed, 18 Jun 2014 08:23:53 +0000 (18:23 +1000)]
staging: lustre: lclient: lcommon_cl.c fixing coding style issues
fixed: ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Anil Belur <askb23@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anil Belur [Wed, 18 Jun 2014 08:23:52 +0000 (18:23 +1000)]
staging: lustre: lclient: lcommon_cl.c fixing coding style issues
fixed: WARNING: Missing a blank line after declarations
Signed-off-by: Anil Belur <askb23@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anil Belur [Wed, 18 Jun 2014 08:23:51 +0000 (18:23 +1000)]
staging: lustre: lclient: lcommon_misc.c fixing coding style issues
fixed warning:
* WARNING: min() should probably be min_t(__u32, desc.ld_tgt_count,
LOV_MAX_STRIPE_COUNT)
Signed-off-by: Anil Belur <askb23@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anil Belur [Wed, 18 Jun 2014 08:23:50 +0000 (18:23 +1000)]
staging: lustre: lclient: glimpse.c fixing coding style issues
fixed "WARNING: labels should not be indented"
Signed-off-by: Anil Belur <askb23@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anil Belur [Wed, 18 Jun 2014 08:23:49 +0000 (18:23 +1000)]
staging: lustre: lclient: glimpse.c fixing coding style issues
Fixed "ERROR: need consistent spacing around '+' (ctx:WxV)"
Signed-off-by: Anil Belur <askb23@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Scott Weir [Mon, 16 Jun 2014 10:44:51 +0000 (20:44 +1000)]
staging: lustre: Fix sparse warnings for undeclared symbols
This patch fixes the sparse warnings in drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c:
sec_lproc.c:58:6: warning: symbol 'sec_flags2str' was not declared. Should it be static?
Signed-off-by: Scott Weir <sjw0410@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vitaly Osipov [Sat, 14 Jun 2014 07:29:51 +0000 (17:29 +1000)]
staging: lustre: remove memset(0) after LIBCFS_ALLOC
Joe Perches mentioned on driverdev-devel that memset after LIBCFS_ALLOC
is not necessary as it is already done during LIBCFS_ALLOC_POST. This
commit removes these unnecessary memsets. Based on the results of running
a cocci patch along the lines of:
@@
expression E1, E2;
@@
LIBCFS_ALLOC (E1,E2);
...
- memset(E1,0,E2);
Signed-off-by: Vitaly Osipov <vitaly.osipov@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Marc Fite [Thu, 12 Jun 2014 17:28:16 +0000 (19:28 +0200)]
staging: lustre: removed spaces at the start of a line
This is a patch in order to remove 2 lines with spaces at the start of the line.
Signed-off-by: Marc Fite <marc@fite.cat>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John Church [Mon, 2 Jun 2014 13:31:10 +0000 (14:31 +0100)]
staging: lustre: fix sparse warnings for undeclared symbols
This patch fixes the following sparse warnings for drivers/staging/lustre/lnet/lnet/router.c:
router.c:139:1: warning: symbol 'lnet_ni_notify_locked' was not declared. Should it be static?
router.c:277:1: warning: symbol 'lnet_add_route_to_rnet' was not declared. Should it be static?
Signed-off-by: John Church <sleeveroller@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Honggang Li [Thu, 12 Jun 2014 07:13:39 +0000 (15:13 +0800)]
lustre/osc/osc_dev.c add a blank line after declarations
Signed-off-by: Honggang Li <enjoymindful@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Honggang Li [Thu, 12 Jun 2014 07:13:38 +0000 (15:13 +0800)]
lustre/osc/osc_dev.c remove space between sizeof and open parenthesis
Signed-off-by: Honggang Li <enjoymindful@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tair Rzayev [Sat, 31 May 2014 20:33:59 +0000 (23:33 +0300)]
staging: wlan-ng: cfg80211.c: Fix sparse warnings
Include necessary header files to avoid "should be static" sparse warning
Signed-off-by: Tair Rzayev <tair.rzayev@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jeff Oczek [Sat, 14 Jun 2014 13:21:17 +0000 (09:21 -0400)]
staging: tidspbridge: Fix whitespace for pointers in function headers
Change style in function headers from 'type * ptr' to 'type *ptr'
Signed-off-by: Jeff Oczek <jeffoczek@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jeff Oczek [Sat, 14 Jun 2014 13:21:16 +0000 (09:21 -0400)]
staging: tidspbridge: Add parameter names to function ptrs in struct dbll_attrs
Add more descriptive names to function pointers in definition of struct dbll_attrs
Signed-off-by: Jeff Oczek <jeffoczek@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Radek Dostal [Sat, 14 Jun 2014 14:13:09 +0000 (16:13 +0200)]
staging/fwserial: (coding style) remove not needed return statements
Style-only modifications to make checkpatch.pl -f a bit happier.
Fixes warning: "void function return statements are not generally useful"
Signed-off-by: Radek Dostal <rd@radekdostal.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Radek Dostal [Sat, 14 Jun 2014 14:13:08 +0000 (16:13 +0200)]
staging/fwserial: (coding style) add blank line after every declaration
Style-only modifications to make checkpatch.pl -f a bit happier.
Fixes warning: "Missing a blank line after declarations"
Signed-off-by: Radek Dostal <rd@radekdostal.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mathias Engan [Thu, 12 Jun 2014 18:58:12 +0000 (20:58 +0200)]
staging: keucr: usb.c: add blank lines after declarations
Add blank line after declarations in eucr_suspend and eucr_resume
as reported by checkpatch.
Signed-off-by: Mathias Engan <mathias.engan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Julia Lawall [Wed, 4 Jun 2014 09:07:54 +0000 (11:07 +0200)]
staging: tidspbridge: use safer test on the result of find_first_zero_bit
Find_first_zero_bit considers BITS_PER_LONG bits at a time, and thus may
return a larger number than the maximum position argument if that position
is not a multiple of BITS_PER_LONG.
The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression e1,e2,e3;
statement S1,S2;
@@
e1 = find_first_zero_bit(e2,e3)
...
if (e1
- ==
+ >=
e3)
S1 else S2
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rickard Strandqvist [Tue, 3 Jun 2014 22:23:39 +0000 (00:23 +0200)]
staging: tidspbridge: pmgr: dspapi.c: Cleaning up uninitialized variable
There is a risk that the variables will be used without being initialized.
Has also improved error handling, after an email proposal from Dan Carpenter.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Wolfgang Ocker [Mon, 2 Jun 2014 20:48:06 +0000 (22:48 +0200)]
staging: comedi: style - use kmalloc_array(n, s, ...) instead of kmalloc(n*s, ...)
Fix a style issue reported by checkpatch.pl for the Eudyptula challenge
Signed-off-by: Wolfgang Ocker <weo@weo1.de>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Hoang Tran [Mon, 16 Jun 2014 07:18:37 +0000 (15:18 +0800)]
staging: goldfish: fix coding style.
Using an else following a break or return can unnecessarily
indent code blocks.
This patch fixes coding style reported by checkpatch.pl, a part
of eudyptula challenge.
Signed-off-by: Hoang Tran <hoangtran.gwr@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 29 May 2014 17:56:32 +0000 (10:56 -0700)]
staging: comedi: ni_stc.h: add read/write callbacks to struct ni_private
The {read,write}[bwl] macros used to access the registers in the ni_atmio,
ni_mio_cs, and ni_pcimio drivers and the included ni_mio_common.c file all
rely on a local variable having a specific name. They also require some of
the ni_mio_common code to need a __maybe_unused tag on the devpriv local
variable.
Remove all the macros by converting them into private functions and storing
the callbacks in the private data.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 29 May 2014 17:56:31 +0000 (10:56 -0700)]
staging: comedi: ni_stc.h: remove unused members from struct ni_private
Remove all the unsed members from the private data for the ni mio drivers.
The ao0p and ao1p members are only used in the ni_ao_reset() function and
the code is commented out. Remove them, and the commented out code, as well.
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, 29 May 2014 17:56:30 +0000 (10:56 -0700)]
staging: comedi: ni_stc.h: remove NI_PRIVATE_COMMON macro
This macro is used to create the private data structure that is used by
the ni_atmio, ni_mio_cs, and ni_pcimio drivers. These drivers all include
the ni_mio_common.c source to provide most of the driver functionality.
The only driver specific information needed to convert the macro into a
proper struct definition is the MAX_N_CALDACS define. This define is used
to size a couple array members in the struct. The ni_atmio and ni_mio_cs
drivers both define MAX_N_CALDACS as 32. The ni_pcimio driver defines it
as (16+16+2). The ni_mio_common file only uses this define to sanity check
that the struct members are large enough for the number of channels in
the calibration subdevice.
Move the MAX_N_CALDACS define to ni_stc.h and set it to the largest number
of caldacs (34).
The ni_atmio and ni_mio_cs drivers also add one additional member to the
private data struct before using the NI_PRIVATE_COMMON macro.
For the ni_atmio driver, the struct pnp_dev pointer can be saved in the
comedi_device as the 'hw_dev'. The (*detach) of this driver can then use
to_pnp_dev() to get it back when detaching the pnp device.
In the ni_mio_cs driver, the struct pcmia_device pointer is not used so
it can simply be removed.
The NI_PRIVATE_COMMON macro can then be converted into a proper struct
definition.
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, 29 May 2014 17:45:52 +0000 (10:45 -0700)]
staging: comedi: ke_counter: add ability to select counter clock source
Add an (*insn_config) to the counter subdevice to allow the user to select
the clock source for the counters using the INSN_CONFIG_SET_CLOCK_SRC
instruction. The current selection can be queried with the instruction
INSN_CONFIG_GET_CLOCK_SRC.
Also, handle the INSN_CONFIG_RESET instruction to reset all the counters.
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, 29 May 2014 17:35:10 +0000 (10:35 -0700)]
staging: comedi: adl_pci9111: simplify A/D trigger selection code
The functions pci9111_trigger_source_set(), pci9111_pretrigger_set(),
and pci9111_autoscan_set() are all used to select the A/D trigger type.
They all do a read/mask/set/write of the A/D Trigger Mode Control register.
Simplify the code by removing these helper functions and combining all
the trigger bits so that a single write can be used to set 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, 29 May 2014 17:35:09 +0000 (10:35 -0700)]
staging: comedi: adl_pci9111: remove PCI9111_HR_DEVICE_ID define
This define is only used in the pci_device_id table and doesn't add
any additional clarity to the code. Remove the define and just open
code the value.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 29 May 2014 17:35:08 +0000 (10:35 -0700)]
staging: comedi: adl_pci9111: remove PCI9111_DRIVER_NAME define
This define is only used in a comedi_error() message. The addition of
the driver name to the message is not necessary. Remove the define.
For aesthetics, convert the comedi_error() into a dev_dbg().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 29 May 2014 17:42:23 +0000 (10:42 -0700)]
staging: comedi: pcl724: add support for Diamond Systems ONYX-MM-DIO module
The Diamond Systems ONYX-MM-DIO board is a PC/104 module with two 8255
chips providing 48 digital I/O channels.
This board can be supported by the pcl724 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, 29 May 2014 17:42:22 +0000 (10:42 -0700)]
staging: comedi: pcl730: add support for Diamond Systems IR104-PBF module
The Diamond Systems IR104-PBF board is a PC/104 module with 20
optoisolated inputs and 20 relay outputs.
This board can be supported by the pcl730 driver.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregk@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 29 May 2014 17:30:05 +0000 (10:30 -0700)]
staging: comedi: addi_common.h: remove ADDIDATA_* defines
These defines don't add any additional clarity to the addi_data drivers.
Just remove 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 [Thu, 29 May 2014 17:30:04 +0000 (10:30 -0700)]
staging: comedi: addi_common.h: remove {LO, HI}WORD macros
These macros don't add any additional clarity to the addi_data drivers.
Just remove 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 [Thu, 29 May 2014 17:30:03 +0000 (10:30 -0700)]
staging: comedi: addi_common.h: remove ADDIDATA_{EN, DIS}ABLE defines
These defines don't add any additional clarity to the addi_data drivers.
Just remove 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 [Thu, 29 May 2014 17:30:02 +0000 (10:30 -0700)]
staging: comedi: addi_common.h: remove ADDI_{EN, DIS}ABLE defines
These defines don't add any additional clarity to the addi_data drivers.
They are also only used in the addi_apci_3120 driver. Just remove 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 [Thu, 29 May 2014 17:30:01 +0000 (10:30 -0700)]
staging: comedi: addi_common.h: remove APCI1710_SAVE_INTERRUPT define
This define is not used. Remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 29 May 2014 17:30:00 +0000 (10:30 -0700)]
staging: comedi: addi_common.h: remove 'b_SingleDiff' from private data
This member is set but never used. Just remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Thu, 29 May 2014 11:15:46 +0000 (12:15 +0100)]
staging: comedi: ni_daq_700: update driver comment
Reformat the comment describing this comedi driver to use the usual
block comment format.
Also remove reference to digital I/O emulating an 8255, because it
doesn't, and remove "DIO only" from the "Description:" line as it also
supports analog inputs.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Wed, 28 May 2014 23:34:54 +0000 (16:34 -0700)]
staging: comedi: adq12b: tidy up the register map defines
Cleanup the existing defines and add some missing bit 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 [Wed, 28 May 2014 23:34:53 +0000 (16:34 -0700)]
staging: comedi: adq12b: tidy up the subdevice init
For aesthetics, add some whitespace to the subdevice init.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Wed, 28 May 2014 23:34:52 +0000 (16:34 -0700)]
staging: comedi: adq12b: remove 's->len_chanlist' init for analog inputs
This driver does not support async commands so the len_chanlist init is
unnecessary. Remove it and allow the core to default the value to '1'.
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 [Wed, 28 May 2014 23:34:51 +0000 (16:34 -0700)]
staging: comedi: adq12b: remove ADQ12B_SIZE define
This define is only used in the comedi_request_region() call to
specify the I/O resource size. Remove it and just open code the
value.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Wed, 28 May 2014 23:34:50 +0000 (16:34 -0700)]
staging: comedi: adq12b: remove 'differential' from private data
This member of the private data is only used during the attach to
determine if there are 8 differential or 16 single-ended analog
inputs. Remove the member and use the comedi_devconfig option
directly.
Also, fix the subdev_flags when differential analog inputs are used.
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 [Wed, 28 May 2014 23:34:49 +0000 (16:34 -0700)]
staging: comedi: adq12b: remove 'unipolar' from private data
This member of the private data is only used during the attach to
determine which range table to use for the analog inputs. Remove
the member and use the comedi_devconfig option directly.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Wed, 28 May 2014 23:34:48 +0000 (16:34 -0700)]
staging: comedi: adq12b: tidy up adq12b_ai_rinsn()
For aesthetics, rename this function.
Clean up the local variables by reusing 'val' instead of using
separate variables for the:
'status' - use once to trigger the first A/D conversion
'hi' and 'lo' - used to read the A/D conversion result
For aesthetics, change the final return to insn->n and remove the
comment.
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 [Wed, 28 May 2014 23:34:47 +0000 (16:34 -0700)]
staging: comedi: adq12b: fix ctreg (ai channel/range) programming
This driver only updates the ctreg (ai channel/range) register if the
desired channel or range has changed since the last analog input read
operation. It does this becuase the hardware requires an udelay to
allow the multiplexor to settle. Unfortunatly the current code never
updates the 'last_channel' and 'last_range' in the private data so
the ctreg gets updated every time.
Fix this and simplify it a bit by just storing the last ctreg value
in the private data.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>