platform/kernel/linux-exynos.git
9 years agostaging: unisys: define structures outside of iochannel
David Kershner [Tue, 16 Jun 2015 03:31:58 +0000 (23:31 -0400)]
staging: unisys: define structures outside of iochannel

During testing with visornic the offset of num_rcv_bufs
was being reported at 188 instead of 186. The vnic structure
starts at 180 and the macaddr is only 6 bytes long.

When I defined and packed the structures outside of the struct
and then referenced them in the struct the correct offset
was generated.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: Remove visorchannel stub
David Kershner [Tue, 16 Jun 2015 03:31:57 +0000 (23:31 -0400)]
staging: unisys: Remove visorchannel stub

Visorchannel directory has been stripped down to almost nothing, and is
no longer referenced. This finishes getting rid of the directory.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: s-Par video channel includes EFI framebuffer
David Kershner [Tue, 16 Jun 2015 03:31:56 +0000 (23:31 -0400)]
staging: unisys: s-Par video channel includes EFI framebuffer

The efi framebuffer is defined within the s-Par video channel
console. Before we get the device create message for the video
console, s-Par has alreaady informed linux about the efi
framebuffer and a memory region is already set up for it. Since
we do not use the video channel in linux, we are just ignoring
the failure of the video channel request_mem_region.

Testing: This patch was tested on top of s-Par and we no longer
leave the partition in a failed state.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: kill unused INCLUDE_MULTI_FUNC_* macros
Jakub Sitnicki [Tue, 16 Jun 2015 04:17:23 +0000 (06:17 +0200)]
staging: rtl8188eu: kill unused INCLUDE_MULTI_FUNC_* macros

Also, remove rt_multi_func enum used exclusively by the killed macros.

Signed-off-by: Jakub Sitnicki <jsitnicki@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: fix typo in comments section
Hari Prasath Gujulan Elango [Mon, 15 Jun 2015 09:27:38 +0000 (09:27 +0000)]
staging: rtl8188eu: fix typo in comments section

This patch fixes a typo in the comment section.

Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: wlan-ng: Replace hard coded values with MACRO's
Hari Prasath Gujulan Elango [Mon, 15 Jun 2015 11:48:53 +0000 (11:48 +0000)]
staging: wlan-ng: Replace hard coded values with MACRO's

This patch replaces hard coded values with global definitions for the
Ethernet IEEE 802.3 interface defined in standard header file.

Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: emxx_udc: remove commented code
Hari Prasath Gujulan Elango [Mon, 15 Jun 2015 10:54:26 +0000 (10:54 +0000)]
staging: emxx_udc: remove commented code

This patch removes commented code warned by checkpatch.pl

Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: comedi: remove commented code
Hari Prasath Gujulan Elango [Mon, 15 Jun 2015 10:10:18 +0000 (10:10 +0000)]
staging: comedi: remove commented code

This patch removes commented code.This was a checkpatch warning.

Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: wilc1000: remove unnecessary cast
ChengYi He [Mon, 15 Jun 2015 19:04:59 +0000 (03:04 +0800)]
staging: wilc1000: remove unnecessary cast

kmalloc() returns void pointer.

Signed-off-by: ChengYi He <chengyihetaipei@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: wilc1000: remove the warnings on prohibited spaces.
Sunghoon Cho [Mon, 15 Jun 2015 10:42:32 +0000 (19:42 +0900)]
staging: wilc1000: remove the warnings on prohibited spaces.

Remove space prohibited between function name and open parenthesis.

Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: wilc1000: remove multiple blank lines.
Sunghoon Cho [Mon, 15 Jun 2015 10:42:31 +0000 (19:42 +0900)]
staging: wilc1000: remove multiple blank lines.

Remove the warnings for multiple blank lines reported by checkpatch.pl.

Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: wilc1000: align defines
Chaehyun Lim [Mon, 15 Jun 2015 03:35:48 +0000 (12:35 +0900)]
staging: wilc1000: align defines

Align the lines of some defines in wilc_errorsupport.h

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: wilc1000: change WILC_Char to char
Dean Lee [Mon, 15 Jun 2015 02:58:57 +0000 (11:58 +0900)]
staging: wilc1000: change WILC_Char to char

change own data type(WILC_Char) to common data type(char)

Signed-off-by: Dean Lee <dean.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: vt6655: fix c99 comments and line length
matt mooney [Tue, 16 Jun 2015 03:38:22 +0000 (20:38 -0700)]
staging: vt6655: fix c99 comments and line length

Change comment style and remove extra spaces before macro names to
avoid exceeding 80 characters.

Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: don't define OnAuth() in non-AP mode
Luca Ceresoli [Sun, 14 Jun 2015 12:40:24 +0000 (14:40 +0200)]
staging: rtl8188eu: don't define OnAuth() in non-AP mode

If CONFIG_88EU_AP_MODE is undefined, OnAuth() is never referenced.

Fixes warning:
  drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2725:21: warning: ‘OnAuth’ defined but not used [-Wunused-function]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Fixes: 68345dd7bc26 ("staging: rtl8188eu: rtw_mlme_ext.c: unexport message callbacks")
Cc: Greg Kroah-Hartman <gregkh@linux.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: don't define issue_asocrsp() in non-AP mode
Luca Ceresoli [Sun, 14 Jun 2015 12:40:23 +0000 (14:40 +0200)]
staging: rtl8188eu: don't define issue_asocrsp() in non-AP mode

If CONFIG_88EU_AP_MODE is undefined, issue_asocrsp() is never referenced.

Fixes warning:
  drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:891:13: warning: ‘issue_asocrsp’ defined but not used [-Wunused-function]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Fixes: 782eddd748d9 ("staging: rtl8188eu: unexport internal functions")
Cc: Greg Kroah-Hartman <gregkh@linux.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging:rtl8723au:rtw_ap:space prohibited between function name & '('
Joglekar Tejas [Sun, 14 Jun 2015 04:25:28 +0000 (04:25 +0000)]
staging:rtl8723au:rtw_ap:space prohibited between function name & '('

This patch removes the warning "space prohibited between
function name and open parenthesis"given by checkpatch.pl

Signed-off-by: Joglekar Tejas <tjogleka@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging:rtl8723au:ioctl_cfg80211:spaces required around '>'
Joglekar Tejas [Sun, 14 Jun 2015 03:01:06 +0000 (03:01 +0000)]
staging:rtl8723au:ioctl_cfg80211:spaces required around '>'

This patch removes the error given by checkpatch.pl
" spaces required around that '>' "

Signed-off-by: Joglekar Tejas <tjogleka@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: correct a typo in a comment
Anton Gerasimov [Sat, 13 Jun 2015 19:36:35 +0000 (22:36 +0300)]
staging: fbtft: correct a typo in a comment

Typo in a comment to register write corrected.

Signed-off-by: Anton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: reformat hardcoded sequences
Anton Gerasimov [Sat, 13 Jun 2015 19:23:55 +0000 (22:23 +0300)]
staging: fbtft: reformat hardcoded sequences

Added spaces after commas in initialization sequences and removed
unnecessary line continuations.

Signed-off-by: Anton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: rearrange comments for readability
Anton Gerasimov [Sat, 13 Jun 2015 19:23:54 +0000 (22:23 +0300)]
staging: fbtft: rearrange comments for readability

Placed comments to register writes before the function calls to
eliminate long strings and make code more readable.

Signed-off-by: Anton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: eliminate code duplication
Anton Gerasimov [Sat, 13 Jun 2015 19:23:53 +0000 (22:23 +0300)]
staging: fbtft: eliminate code duplication

Eliminated code duplication when searching for a display.

Signed-off-by: Anton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: remove unnecessary spaces before tabs
Anton Gerasimov [Sat, 13 Jun 2015 19:23:52 +0000 (22:23 +0300)]
staging: fbtft: remove unnecessary spaces before tabs

The patch removes spaces before tabs so that checkpatch.pl is content.

Signed-off-by: Anton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: remove unnecessary line continuations
Anton Gerasimov [Sat, 13 Jun 2015 19:23:51 +0000 (22:23 +0300)]
staging: fbtft: remove unnecessary line continuations

Removed unnecessary line continuations in several lines.

Signed-off-by: Anton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: make module descriptions greppable
Anton Gerasimov [Sat, 13 Jun 2015 19:23:50 +0000 (22:23 +0300)]
staging: fbtft: make module descriptions greppable

Split module description strings are merged for searchability.

Signed-off-by: Anton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: replace spaces with tabs
Anton Gerasimov [Sat, 13 Jun 2015 19:23:49 +0000 (22:23 +0300)]
staging: fbtft: replace spaces with tabs

Indentation with spaces fixed.

Signed-off-by: Anton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: put spaces around assignment operators
Anton Gerasimov [Sat, 13 Jun 2015 19:23:48 +0000 (22:23 +0300)]
staging: fbtft: put spaces around assignment operators

Put spaces around assignment operators for readability.

Signed-off-by: Anton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: fbtft: split long strings
Anton Gerasimov [Sat, 13 Jun 2015 19:23:47 +0000 (22:23 +0300)]
staging: fbtft: split long strings

Split long function declarations, function calls, comments etc.

Signed-off-by: Anton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix "missing a blank line" coding style
Alessandro Parini [Sat, 13 Jun 2015 15:40:49 +0000 (17:40 +0200)]
staging: unisys: fix "missing a blank line" coding style

fix coding style issue "Missing a blank line after declarations"
detected by checkpatch.pl in visorchipset.c

Signed-off-by: Alessandro Parini <alessandro.parini@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: fix braces coding style
Alessandro Parini [Sat, 13 Jun 2015 15:40:48 +0000 (17:40 +0200)]
staging: unisys: fix braces coding style

fix coding style issue "braces {} are not necessary for single statement blocks"
detected by checkpatch.pl in visorchipset.c

Signed-off-by: Alessandro Parini <alessandro.parini@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: vme_user: remove buf_unalloc helper
Dmitry Kalinkin [Sat, 13 Jun 2015 13:34:03 +0000 (16:34 +0300)]
staging: vme_user: remove buf_unalloc helper

buf_unalloc is essentially a vme_free_consistent:
1) image[i].kern_buf is never NULL in buf_alloc call
2) kern_buf, pci_buf and size_buf get zeroed in vme_user_probe anyway

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: vme_user: remove open/release
Dmitry Kalinkin [Sat, 13 Jun 2015 13:34:02 +0000 (16:34 +0300)]
staging: vme_user: remove open/release

Checking for image[minor].resource != NULL is not needed since all
resources are allocated before device is created.

image[minor].users accounting is deleted because it's not being used.

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: vme_user: remove forward declarations
Dmitry Kalinkin [Sat, 13 Jun 2015 13:34:01 +0000 (16:34 +0300)]
staging: vme_user: remove forward declarations

Reorder code so that forward declarations are not needed.

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8712: fix else after break or return warning
Dogukan Ergun [Sat, 13 Jun 2015 12:04:26 +0000 (15:04 +0300)]
staging: rtl8712: fix else after break or return warning

This patch fixes checkpatch.pl warning.
WARNING: else is not generally useful after a break or return

Signed-off-by: Dogukan Ergun <dogukan.ergun@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: wilc1000: remove itypes.h
Chaehyun Lim [Sat, 13 Jun 2015 06:41:19 +0000 (15:41 +0900)]
staging: wilc1000: remove itypes.h

Remove itypes.h that is not needed.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: wilc1000: remove BOOL_T typedef
Chaehyun Lim [Sat, 13 Jun 2015 06:41:18 +0000 (15:41 +0900)]
staging: wilc1000: remove BOOL_T typedef

Remove BOOL_T typedef.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: cleanup iochannel includes
David Kershner [Sat, 13 Jun 2015 03:12:35 +0000 (23:12 -0400)]
staging: unisys: cleanup iochannel includes

The iochannel.h file no longer needs to include
conttrolvmchannel.h, vbuschannel.h and vmcallinterfaces.h.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agovme: tsi148: depend on HAS_DMA for Kconfig
Dmitry Kalinkin [Thu, 28 May 2015 12:07:12 +0000 (15:07 +0300)]
vme: tsi148: depend on HAS_DMA for Kconfig

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: vme_user: remove unused counters
Dmitry Kalinkin [Thu, 28 May 2015 12:07:08 +0000 (15:07 +0300)]
staging: vme_user: remove unused counters

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agovme: ca91cx42: fix LM_CTL address mask
Dmitry Kalinkin [Thu, 28 May 2015 12:07:07 +0000 (15:07 +0300)]
vme: ca91cx42: fix LM_CTL address mask

Universe II datasheet defines following address space values
for LM_CTL[16:18]

000=A16
001=A24
010=A32
011,100,101=Reserved
110=User1
111=User2

Mask 5<<16 is not the right one for matching [16:18], instead we should
use 7<<16.

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agovme: ca91cx42: return error code on DMA error
Dmitry Kalinkin [Thu, 28 May 2015 12:07:06 +0000 (15:07 +0300)]
vme: ca91cx42: return error code on DMA error

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agovme: export vme_check_window()
Dmitry Kalinkin [Thu, 28 May 2015 12:07:04 +0000 (15:07 +0300)]
vme: export vme_check_window()

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agovme: check for A64 overflow in vme_check_window()
Dmitry Kalinkin [Thu, 28 May 2015 12:07:03 +0000 (15:07 +0300)]
vme: check for A64 overflow in vme_check_window()

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: vme_user: refactor llseek to switch(){}
Dmitry Kalinkin [Thu, 28 May 2015 12:07:02 +0000 (15:07 +0300)]
staging: vme_user: refactor llseek to switch(){}

This makes vme_user_llseek ignore all minors that don't have llseek
implementation.

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agovme: stop DMA transfer on interruption
Dmitry Kalinkin [Thu, 28 May 2015 12:07:01 +0000 (15:07 +0300)]
vme: stop DMA transfer on interruption

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agovme: tsi148: fix first DMA item mapping
Dmitry Kalinkin [Thu, 28 May 2015 12:07:00 +0000 (15:07 +0300)]
vme: tsi148: fix first DMA item mapping

This moves DMA mapping of the first list element to vme_list_add, the
same place where other elements mappings occur. This prevents extra
mapping or over-unmapping in the cases when vme_list_exec is called more
or less than one time respectively.

Also adds dma_mapping_error check.

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agovme: tsi148: fix DMA lists longer that one item
Dmitry Kalinkin [Thu, 28 May 2015 12:06:59 +0000 (15:06 +0300)]
vme: tsi148: fix DMA lists longer that one item

DMA lists on tsi148 weren't processed further than the first item
because of the broken logic. This regression was introduced in:

ac1a4f2caf7b071 "Staging: VME: Ensure TSI148 link list descriptors..."

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoDocumentation: mention vme_master_mmap() in VME API
Dmitry Kalinkin [Thu, 28 May 2015 12:06:58 +0000 (15:06 +0300)]
Documentation: mention vme_master_mmap() in VME API

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: remove function which does nothing
Sudip Mukherjee [Fri, 12 Jun 2015 10:50:43 +0000 (16:20 +0530)]
staging: rtl8188eu: remove function which does nothing

The function rtw_mfree_all_stainfo() is just holding the lock,
traversing the list, and then unlocking. It is not doing anything else.
So removed the function and modified the places from where it was called.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: remove unused variables
Sudip Mukherjee [Fri, 12 Jun 2015 10:50:42 +0000 (16:20 +0530)]
staging: rtl8188eu: remove unused variables

These variables were being set but not used afterwards.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: remove unused enum and CONFIG
Sudip Mukherjee [Fri, 12 Jun 2015 10:50:41 +0000 (16:20 +0530)]
staging: rtl8188eu: remove unused enum and CONFIG

The CONFIGs, the enum and the function declaration was not being
used anywhere.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: fix wrong debug print
Luca Ceresoli [Thu, 11 Jun 2015 22:20:49 +0000 (00:20 +0200)]
staging: rtl8188eu: fix wrong debug print

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: issue_probersp(): remove unused variable and dead code
Luca Ceresoli [Thu, 11 Jun 2015 22:20:48 +0000 (00:20 +0200)]
staging: rtl8188eu: issue_probersp(): remove unused variable and dead code

is_valid_p2p_probereq is initialized to false and never modified. Code
depending on it is dead code. Remove all of it.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8723au: issue_probersp(): remove unused parameter
Luca Ceresoli [Thu, 11 Jun 2015 22:20:47 +0000 (00:20 +0200)]
staging: rtl8723au: issue_probersp(): remove unused parameter

The is_valid_p2p_probereq is never referenced in the function body.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: issue_probersp(): remove unused parameter
Luca Ceresoli [Thu, 11 Jun 2015 22:20:46 +0000 (00:20 +0200)]
staging: rtl8188eu: issue_probersp(): remove unused parameter

The is_valid_p2p_probereq is never referenced in the function body.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: unexport internal functions
Luca Ceresoli [Thu, 11 Jun 2015 22:20:45 +0000 (00:20 +0200)]
staging: rtl8188eu: unexport internal functions

These are internal functions. Remove their declaration in rtw_mlme_ext.h
and make them static.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: rtw_mlme_ext.c: unexport message callbacks
Luca Ceresoli [Thu, 11 Jun 2015 22:20:44 +0000 (00:20 +0200)]
staging: rtl8188eu: rtw_mlme_ext.c: unexport message callbacks

These are internal functions. Remove their declaration in rtw_mlme_ext.h
and make them static.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8188eu: rtw_mlme_ext.c: reorder message callbacks and tables
Luca Ceresoli [Thu, 11 Jun 2015 22:20:43 +0000 (00:20 +0200)]
staging: rtl8188eu: rtw_mlme_ext.c: reorder message callbacks and tables

The message handling stored in mlme_sta_tbl and OnAction_tbl are internal and
will be declared static, and their declaration removed from rtw_mlme_ext.h, in
a later commit.

This would break compilation, since they are are referenced before their
definition.

Reorder these functions and the structures that hold them so that symbols are
defined before they are referenced, without the need for forward declarations.

This commit only reorders code, there is no content change.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: sm750fb: fix c99 comments
Juston Li [Fri, 12 Jun 2015 10:17:22 +0000 (03:17 -0700)]
staging: sm750fb: fix c99 comments

fixed all checkpatch.pl ERROR: do not use C99 // comments

Any C99 comments used to comment out code are simply removed.
Also some of the errors occur inside '#if 0' blocks which I
might as well fix since checkpatch.pl caught them but the blocks
themselves should probably be cleaned up later.

Changes since v1: close a comment block

Signed-off-by: Juston Li <juston.h.li@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8192u: Removed redundant bool comparisons in r8192U_dm.c
Harisangam Sharvari [Thu, 11 Jun 2015 12:38:13 +0000 (12:38 +0000)]
staging: rtl8192u: Removed redundant bool comparisons in r8192U_dm.c

This patch was detected with the help of coccinelle tool.
The redundant comparisons of bool variables are removed in r8192U_dm.c.

Signed-off-by: Harisangam Sharvari <sharisan@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8192u: ieee80211: Fix sparse endianness warnings ieee80211_softmac.c
Gaston Gonzalez [Wed, 10 Jun 2015 22:46:25 +0000 (19:46 -0300)]
staging: rtl8192u: ieee80211: Fix sparse endianness warnings ieee80211_softmac.c

Fix the following endinness warnings detected by sparse:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:669:34: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:669:34:    expected restricted __le16 [usertype] duration_id
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:669:34:    got int

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:679:33: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:679:33:    expected restricted __le16 [usertype] algorithm
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:679:33:    got int

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:1090:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:1090:32:    expected restricted __le16 [usertype] duration_id
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:1090:32:    got int

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:1109:30: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:1109:30:    expected restricted __le16 [usertype] listen_interval
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:1109:30:    got int

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:3130:24: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:3130:24:    expected restricted __le16 [usertype] reason
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:3130:24:    got unsigned char [unsigned] [usertype] asRsn

Signed-off-by: Gaston Gonzalez <gascoar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: speakup: use swap() in get_highlight_color()
Fabian Frederick [Wed, 10 Jun 2015 16:33:38 +0000 (18:33 +0200)]
staging: speakup: use swap() in get_highlight_color()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8723au: use swap() in WMMOnAssocRsp23a()
Fabian Frederick [Wed, 10 Jun 2015 16:32:17 +0000 (18:32 +0200)]
staging: rtl8723au: use swap() in WMMOnAssocRsp23a()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8712: use swap() in dequeue_xframe_ex()
Fabian Frederick [Wed, 10 Jun 2015 16:32:13 +0000 (18:32 +0200)]
staging: rtl8712: use swap() in dequeue_xframe_ex()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: rtl8188eu: use swap() in WMMOnAssocRsp()
Fabian Frederick [Wed, 10 Jun 2015 16:32:28 +0000 (18:32 +0200)]
Staging: rtl8188eu: use swap() in WMMOnAssocRsp()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8192e: Remove dead code: dig_t::dbg_mode, drx_path_sel::DbgMode
Mateusz Kulikowski [Mon, 8 Jun 2015 21:23:34 +0000 (23:23 +0200)]
staging: rtl8192e: Remove dead code: dig_t::dbg_mode, drx_path_sel::DbgMode

dig_t::dbg_mode and drx_path_sel::DbgMode are initialized to one value and
checked only once in code.This patch throws them away, and deletes
always-true conditions.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: rtl8192e: remove dm_shadow
Mateusz Kulikowski [Mon, 8 Jun 2015 21:23:33 +0000 (23:23 +0200)]
staging: rtl8192e: remove dm_shadow

dm_shadow array is no longer used.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: rtl8192e: Casting correct Endianness
Gnanachandran Dhanapal [Tue, 9 Jun 2015 14:47:49 +0000 (14:47 +0000)]
Staging: rtl8192e: Casting correct Endianness

Casting correct Endianness for __le16 variable used in assignment and
condition check

Signed-off-by: Gnanachandran Dhanapal <gdhanapa@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: rts5208: xd: Fixed checkpatch warning
Nizam Haider [Tue, 9 Jun 2015 04:44:55 +0000 (10:14 +0530)]
Staging: rts5208: xd: Fixed checkpatch warning

Fixed a warning, else is not generally useful after a break or return.

Signed-off-by: Nizam Haider <nizamhaider786@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agoStaging: vt6655: Remove unnecessary equality checks in rxtx.c
Harisangam Sharvari [Tue, 9 Jun 2015 04:27:35 +0000 (04:27 +0000)]
Staging: vt6655: Remove unnecessary equality checks in rxtx.c

The unnecessary equality checks for bool variable are removed in rxtx.c.
These changes were detected with the help of coccinelle tool

Signed-off-by: Harisangam Sharvari <sharisan@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: Don't hold device responses until driver loads
David Kershner [Fri, 12 Jun 2015 20:46:08 +0000 (16:46 -0400)]
staging: unisys: Don't hold device responses until driver loads

Currently if a driver is not loaded for a device, we will not
respond to the device create until it is done. This causes
s-Par to not mark the partition running if the driver for the
device is not loaded. Since there are several devices that
could be assigned to a guest that don't have an actual
driver this will cause us to never go running.

If the device driver is loaded, we WILL continue to only
respond to the device PAUSE message when the device driver
has responded that it is done with the device.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: convert pack pragma to __packed
David Kershner [Fri, 12 Jun 2015 20:46:07 +0000 (16:46 -0400)]
staging: unisys: convert pack pragma to __packed

It was noticed that iochannel.h was still using pragmas to
pack the datastructures, should be using __packed instead.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: Move phys_info to iochannel.h
David Kershner [Fri, 12 Jun 2015 20:46:06 +0000 (16:46 -0400)]
staging: unisys: Move phys_info to iochannel.h

This moves phys_info to iochannel.h. It is only
used by iochannel.h and is not needed in
vmcallinterfaces.h.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: unisys: Remove unneeded variable
Abdul Hussain [Thu, 11 Jun 2015 10:03:49 +0000 (10:03 +0000)]
staging: unisys: Remove unneeded variable

This patch remove unneeded variable used to store return value.

Signed-off-by: Abdul Hussain <habdul@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9 years agostaging: comedi: das08: use better MODULE_DESCRIPTION()
Ian Abbott [Fri, 5 Jun 2015 17:30:35 +0000 (18:30 +0100)]
staging: comedi: das08: use better MODULE_DESCRIPTION()

Replace the boiler-plate Comedi module description string with something
more specific.

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>
9 years agostaging: comedi: das08: clarify sign-magnitude conversion
Ian Abbott [Fri, 5 Jun 2015 17:30:34 +0000 (18:30 +0100)]
staging: comedi: das08: clarify sign-magnitude conversion

For DAS08/JR/16 and DAS08/JR/AO-16 boards, the 16-bit analog input
readings are assumed to be in a sign-magnitude format and need
converting to the COMEDI unsigned sample format.  The expressions to do
the conversion look a little messy.  Use a local variable `magnitude` to
make it easier to follow.

Also, there seems to be some discrepancy between the manual for these
boards and the COMEDI code.  The manual implies that 0 is full-scale
negative and 65535 is full-scale positive.  However, the COMEDI code has
used the sign-magnitude conversion for these boards since these two
boards were initially supported by a patch from an external contributor
to the COMEDI project back in 2001.  Assume the code is correct for now,
but add a comment to mention the discrepancy.

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>
9 years agostaging: comedi: das08: rename das08_do_wbits() & das08jr_do_wbits()
Ian Abbott [Fri, 5 Jun 2015 17:30:33 +0000 (18:30 +0100)]
staging: comedi: das08: rename das08_do_wbits() & das08jr_do_wbits()

`das08_do_wbits()` and `das08jr_do_wbits()` are handlers for the Comedi
`INSN_BITS` instruction for the digital output subdevice on "non-JR" and
"JR" boards, respectively.  Rename them to `das08_do_insn_bits()` and
`das08jr_do_insn_bits()` respectively for consistency.

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>
9 years agostaging: comedi: das08: rename das08_di_rbits() & das08jr_di_rbits()
Ian Abbott [Fri, 5 Jun 2015 17:30:32 +0000 (18:30 +0100)]
staging: comedi: das08: rename das08_di_rbits() & das08jr_di_rbits()

`das08_di_rbits()` and `das08jr_di_rbits()` are handlers for the Comedi
`INSN_BITS` instruction for the digital input subdevice on "non-JR" and
"JR" boards, respectively.  Rename them to `das08_di_insn_bits()` and
`das08jr_di_insn_bits()` respectively for consistency.

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>
9 years agostaging: comedi: das08: rename das08_ai_rinsn()
Ian Abbott [Fri, 5 Jun 2015 17:30:31 +0000 (18:30 +0100)]
staging: comedi: das08: rename das08_ai_rinsn()

`das08_ai_rinsn()` is the handler for Comedi `INSN_READ` instructions
for the AI subdevice.  Rename the function to `das08_ai_insn_read()` for
consistency.

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>
9 years agostaging: comedi: das08: rename the gainlist variables
Ian Abbott [Fri, 5 Jun 2015 17:30:30 +0000 (18:30 +0100)]
staging: comedi: das08: rename the gainlist variables

`das08_pgh_gainlist[]`, `das08_pgl_gainlist[]`, and
`das08_pgm_gainlist[]` hold the gain codes indexed by range index for
various boards that support programmable gain. `das08_gainlist[]` is a
look-up table to find the appropriate gain list for a board.  These are
all associated with the analog input Comedi subdevice.  Rename the
variables to reflect that.

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>
9 years agostaging: comedi: das08: rename ai range tables
Ian Abbott [Fri, 5 Jun 2015 17:30:29 +0000 (18:30 +0100)]
staging: comedi: das08: rename ai range tables

The `range_das08_pgl`, `range_das08_pgm`, and `range_das08_pgh`
variables define the analog input ranges for the "PGL", "PGM", and "PGH"
board variants, and are also used for the "AOL", "AOM", and "AOH" board
variants.  Rename them to use the `das08_` prefix for consistency.

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>
9 years agostaging: comedi: das08.c: reformat remaining comments
Ian Abbott [Fri, 5 Jun 2015 17:30:28 +0000 (18:30 +0100)]
staging: comedi: das08.c: reformat remaining comments

Use the preferred style for block comments.  Squash double spaces after
the comment opening sequence for single-line comments.

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>
9 years agostaging: comedi: das08.c: reformat copyright comment
Ian Abbott [Fri, 5 Jun 2015 17:30:27 +0000 (18:30 +0100)]
staging: comedi: das08.c: reformat copyright comment

Replace double spaces with single spaces at the start of each line in
the copyright comment at the top of the file.

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>
9 years agostaging: comedi: das08: remove board register map comments
Ian Abbott [Fri, 5 Jun 2015 17:30:26 +0000 (18:30 +0100)]
staging: comedi: das08: remove board register map comments

The "das08" module contains some comments outlining the register maps
for some of the ISA boards supported by this module in combination with
the "das08_isa" module.  The comments are somewhat sporadically placed,
don't detail all the boards, and don't use the preferred block comment
style.  If anywhere, they should probably be in the "das08_isa" module.
Just remove them.  The comments for the register macros indicate which
boards they apply to anyway, so we don't lose much information.

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>
9 years agostaging: comedi: das08: rename DAS08AO_AO_UPDATE
Ian Abbott [Fri, 5 Jun 2015 17:30:25 +0000 (18:30 +0100)]
staging: comedi: das08: rename DAS08AO_AO_UPDATE

"AOL", "AOM", and "AOH" boards have a jumper that controls whether
analog output channels are updated simultaneously or individually.  When
set to update individually, individual channels are updated when the
high byte register is written.  When set to update simultaneously,
channels are not updated until any of the analog output registers are
read.  The driver doesn't know the jumper setting and is not interested
in the simultaneous update feature, so it updates a channel by writing
the low byte register, the high byte register, and then reading channel
0's low byte register.

The `DAS08AO_AO_UPDATE` macro contains the offset to the low byte
register for analog output channel 0 on the "AOL", "AOM", and "AOH"
boards, which the driver reads to update the analog outputs.  Rename the
macro to `DAS08AOX_AO_UPDATE_REG` and add a comment.

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>
9 years agostaging: comedi: das08: rename DAS08AO_AO_LSB() and DAS08AO_AO_MSB()
Ian Abbott [Fri, 5 Jun 2015 17:30:24 +0000 (18:30 +0100)]
staging: comedi: das08: rename DAS08AO_AO_LSB() and DAS08AO_AO_MSB()

The `DAS08AO_AO_LSB(x)` macro returns the offset to the analog output
low byte register for channel x (0 or 1) for "AOL", "AOM", and "AOH"
boards.  The `DAS08AO_AO_MSB(x)` macro returns the offset to the
corresponding high byte register.  Rename the macros to
`DAS08AOX_AO_LSB_REG(x)` and `DAS08AOX_AO_MSB_REG(x)` respectively, and
add some comments.

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>
9 years agostaging: comedi: das08: replace DAS08AO_GAIN_CONTROL/STATUS
Ian Abbott [Fri, 5 Jun 2015 17:30:23 +0000 (18:30 +0100)]
staging: comedi: das08: replace DAS08AO_GAIN_CONTROL/STATUS

The `DAS08AO_GAIN_CONTROL` and `DAS08AO_GAIN_STATUS` macros hold the
offset to the "programmable gain" register on "PGL", "PGM", "PGH",
"AOL", "AOM" and "AOH" boards.  Writing a code to this register sets the
gain for the current analog input channel (selected in the main control
register).  The written value can be read back in bits 3..0 of the
register.  Other bits of the register are read-only and not used by the
driver.  Rename `DAS08AO_GAIN_CONTROL` to `DAS08_GAIN_REG` and add a
comment.  Remove `DAS08AO_GAIN_STATUS` as the driver does not use it and
the read-only parts of the register are documented in the comment.

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>
9 years agostaging: comedi: das08: add DAS08JR_AO_UPDATE_REG
Ian Abbott [Fri, 5 Jun 2015 17:30:22 +0000 (18:30 +0100)]
staging: comedi: das08: add DAS08JR_AO_UPDATE_REG

"JR" boards with analog output channels have a jumper that controls
whether analog output channels are updated simultaneously or
individually.  When set to update individually, individual channels are
updated when the high byte register is written. When set to update
simultaneously, channels are not updated until the digital inputs
register is read.  The driver doesn't know how the jumper is set and is
not interested in the simultaneous output feature, so it updates a
channel by writing the low byte, then the high byte, then reading the
digital inputs register.  To make the code more explicit, add a macro
`DAS08JR_AO_UPDATE_REG` with the same value as the `DAS08JR_DI_REG`
macro (for digital inputs) and use it when reading the register to
update the analog outputs.

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>
9 years agostaging: comedi: das08: rename DAS08JR_AO_LSB() and DAS08JR_AO_MSB()
Ian Abbott [Fri, 5 Jun 2015 17:30:21 +0000 (18:30 +0100)]
staging: comedi: das08: rename DAS08JR_AO_LSB() and DAS08JR_AO_MSB()

The `DAS08JR_AO_LSB(x)` macro returns the offset to the analog output
low byte register for channel x (0 or 1) for "JR" boards with analog
output support.  The `DAS08JR_AO_MSB(x)` macro returns the offset to the
corresponding high byte register.  Rename the macros to
`DAS08JR_AO_LSB_REG(x)` and `DAS08JR_AO_MSB_REG(x)` respectively, and
add some comments.

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>
9 years agostaging: comedi: das08: rename and split DAS08JR_DIO
Ian Abbott [Fri, 5 Jun 2015 17:30:20 +0000 (18:30 +0100)]
staging: comedi: das08: rename and split DAS08JR_DIO

The `DAS08JR_DIO` macro contains the offset to the read-only digital
input register and write-only digital output register on the "JR"
boards.  Replace the macro with two new macros (with the same numeric
value) named `DAS08JR_DI_REG` for the digital input register and
`DAS08JR_DO_REG` for the digital output register, and add some comments.

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>
9 years agostaging: comedi: das08: rename DAS08_OP() and DAS08_DO_MASK
Ian Abbott [Fri, 5 Jun 2015 17:30:19 +0000 (18:30 +0100)]
staging: comedi: das08: rename DAS08_OP() and DAS08_DO_MASK

The `DAS08_DO_MASK` macro is a bitmask for the control register
corresponding to the digital output channels (except on "JR" boards).
Rename it to `DAS08_CONTROL_DO_MASK` and add a comment.

The `DAS08_OP(x)` macro takes a bitvector of the desired digital output
channel states and returns the corresponding bits for the control
register (except on "JR" boards).  Rename it to `DAS08_CONTROL_DO(x)`
and add a comment.

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>
9 years agostaging: comedi: das08: rename and rewrite DAS08_INTE
Ian Abbott [Fri, 5 Jun 2015 17:30:18 +0000 (18:30 +0100)]
staging: comedi: das08: rename and rewrite DAS08_INTE

The `DAS08_INTE` macro contains a mask for the "INTE" bit in the control
register (except on "JR" boards).  Setting it to 1 enables interrupts.
Setting it to 0 disables interrupts and clears the "IRQ" bit in the
status register.  Rename the macro to `DAS08_CONTROL_INTE` and add a
comment.  Also use the `BIT()` macro to define its value.  (Note: the
driver does not currently enable interrupts.)

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>
9 years agostaging: comedi: das08: rename DAS08_MUX() and DAS08_MUX_MASK
Ian Abbott [Fri, 5 Jun 2015 17:30:17 +0000 (18:30 +0100)]
staging: comedi: das08: rename DAS08_MUX() and DAS08_MUX_MASK

The `DAS08_MUX_MASK` macro is a bitmask for the control register
corresponding to the analog input multiplexor channel selection bits.
Rename it to `DAS08_CONTROL_MUX_MASK` and add a comment.  Note that the
current setting of the multiplexor can also be read from the same bit
positions in the status register, but the driver does not use it.  Add a
comment to that effect.

The `DAS08_MUX(x)` macro takes an analog input channel number and
returns the corresponding analog input multiplexor channel selection
bits for the control register.  Rename it to `DAS08_CONTROL_MUX(x)` and
add a comment.

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>
9 years agostaging: comedi: das08: rename DAS08_CONTROL
Ian Abbott [Fri, 5 Jun 2015 17:30:16 +0000 (18:30 +0100)]
staging: comedi: das08: rename DAS08_CONTROL

The `DAS08_CONTROL` macro contains the offset to the write-only control
register.  Rename it to `DAS08_CONTROL_REG` and add a comment.

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>
9 years agostaging: comedi: das08: rename and rewrite DAS08_IP
Ian Abbott [Fri, 5 Jun 2015 17:30:15 +0000 (18:30 +0100)]
staging: comedi: das08: rename and rewrite DAS08_IP

The `DAS08_IP()` macro takes a value read from the status register and
returns the state of the three digital input channels (except on "JR"
boards).  Rename it to `DAS08_STATUS_DI()` and add a comment.  Also
re-arrange the expression used to extract the state of the digital
inputs for consistency with other register macros.

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>
9 years agostaging: comedi: das08: rename and rewrite DAS08_IRQ
Ian Abbott [Fri, 5 Jun 2015 17:30:14 +0000 (18:30 +0100)]
staging: comedi: das08: rename and rewrite DAS08_IRQ

The `DAS08_IRQ` macro contains a mask for the "IRQ" status bit.  This is
set to 1 when a rising edge is detected on the external interrupt input
pin of the external connector (which may be jumpered to a pacer output).
It is cleared by setting the "INTE" control bit to 0.  It is not used on
"JR" boards.  Rename the macro to `DAS08_STATUS_IRQ` and add a comment.
Also use the `BIT()` macro to define the value.

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>
9 years agostaging: comedi: das08: rename and rewrite DAS08_EOC
Ian Abbott [Fri, 5 Jun 2015 17:30:13 +0000 (18:30 +0100)]
staging: comedi: das08: rename and rewrite DAS08_EOC

The `DAS08_EOC` macro contains a mask for the "end of A/D conversion"
bit in the status register.  The logic is reverse sense in that the bit
is set to 1 while the conversion is in progress and set to 0 when the
conversion is complete.  Rename the macro to `DAS08_STATUS_AI_BUSY` and
add a comment.  Also make use of the `BIT()` macro to define the value.

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>
9 years agostaging: comedi: das08: rename DAS08_STATUS
Ian Abbott [Fri, 5 Jun 2015 17:30:12 +0000 (18:30 +0100)]
staging: comedi: das08: rename DAS08_STATUS

The `DAS08_STATUS` macro contains the offset to the read-only status
register.  Rename it to `DAS08_STATUS_REG` and add a comment.

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>
9 years agostaging: comedi: das08: rename DAS08_TRIG_12BIT
Ian Abbott [Fri, 5 Jun 2015 17:30:11 +0000 (18:30 +0100)]
staging: comedi: das08: rename DAS08_TRIG_12BIT

The `DAS08_TRIG_12BIT` macro contains the offset to the write-only
software trigger register for 12-bit or 16-bit analog-to-digital
conversions.  Rename the macro to `DAS08_AI_TRIG_REG` and add a comment.

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>
9 years agostaging: comedi: das08: rename DAS08_LSB and DAS08_MSB
Ian Abbott [Fri, 5 Jun 2015 17:30:10 +0000 (18:30 +0100)]
staging: comedi: das08: rename DAS08_LSB and DAS08_MSB

The `DAS08_LSB` and `DAS08_MSB` macros contain the offsets to the
least-significant and most-significant analog input data registers.
Rename them to `DAS08_AI_LSB_REG` and `DAS08_AI_MSB_REG` respectively
and add comments to document them.

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>