aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-05-08Merge 4.1-rc2 into staging-nextGreg Kroah-Hartman226-1643/+2670
We want the fixes in here to make merges and testing easier. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08Staging: rts5208: Replace timeval with timespec64Ksenija Stanojevic1-11/+14
struct timeval tv is used to get current time. 32-bit systems using 'struct timeval' will break in the year 2038, so we have to replace that code with more appropriate types. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8192u: don't redefine container_of()Marti Bolivar1-16/+1
This file already includes <linux/kernel.h>. Signed-off-by: Marti Bolivar <mbolivarmullen@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: iio: ad7606_par: Constify platform_device_idKrzysztof Kozlowski1-1/+1
The platform_device_id is not modified by the driver and core uses it as const. Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08drivers/staging: include <module.h> for modular android tegra_ion codePaul Gortmaker1-0/+1
This file is built off of a tristate Kconfig option and also contains modular function calls so it should explicitly include module.h to avoid compile breakage during header shuffles done in the future. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: "Arve Hj�nnev�g" <arve@android.com> Cc: Riley Andrews <riandrews@android.com> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Alexandre Courbot <gnurou@gmail.com> Cc: devel@driverdev.osuosl.org Cc: linux-tegra@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08rtl8192e: delete local copy of iee80211 reason codes.Paul Gortmaker3-41/+4
This driver has a copy of the standard reason codes from the file <linux/ieee80211.h> but with slightly different name fields. Delete the local copy and remap the only two use cases onto the names used by the global implementation with the same values. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08rtl8192u: delete another embedded instance of generic reason codesPaul Gortmaker1-48/+0
We have global copies of all these reason codes. We don't need local copies. Worse is that these seem totally unused; a grep for some of the fields comes up empty, and it still compiles after its complete removal. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08rtl8192u: don't duplicate ieee80211 constants for status/auth/reasonPaul Gortmaker1-76/+1
These are all defined as a part of the standard and should not be duplicated on a per-driver basis. Use the global ones and delete the local ones. In switching to <linux/ieee80211.h> we have to delete a local copy of an identical struct that we prepped earlier to have identical field names, and we add explicit include <...> where needed in order to preserve getting a successful compile. This isn't the totality of duplicated data removed, but it is a start. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08rtl8192u: align local ieee80211_wmm_ac_param struct fields with globalPaul Gortmaker2-7/+7
The <linux/ieee80211.h> and this local file both have a struct of the same name. They also have the same field sizes and generally the same fields, as can be seen here: ~/git/linux-head$ git grep -A4 'struct ieee80211_wmm_ac_param {' drivers/staging/rtl8192u/ieee80211/ieee80211.h:struct ieee80211_wmm_ac_param { drivers/staging/rtl8192u/ieee80211/ieee80211.h- u8 ac_aci_acm_aifsn; drivers/staging/rtl8192u/ieee80211/ieee80211.h- u8 ac_ecwmin_ecwmax; drivers/staging/rtl8192u/ieee80211/ieee80211.h- u16 ac_txop_limit; drivers/staging/rtl8192u/ieee80211/ieee80211.h-}; -- include/linux/ieee80211.h:struct ieee80211_wmm_ac_param { include/linux/ieee80211.h- u8 aci_aifsn; /* AIFSN, ACM, ACI */ include/linux/ieee80211.h- u8 cw; /* ECWmin, ECWmax (CW = 2^ECW - 1) */ include/linux/ieee80211.h- __le16 txop_limit; include/linux/ieee80211.h-} __packed; ~/git/linux-head$ Here we just align the local field names with the main system one. Then we can add an include of the system one and delete the local copy in one smooth step in a follow-on commit. Not that the replacement: for i in `find . -name '*.[ch]'` ; do sed -i 's/ac_aci_acm_aifsn/aci_aifsn/g' $i ; done for i in `find . -name '*.[ch]'` ; do sed -i 's/ac_ecwmin_ecwmax/cw/g' $i ; done for i in `find . -name '*.[ch]'` ; do sed -i 's/ac_txop_limit/txop_limit/g' $i ; done implicitly shows that only one of the three fields is currently used. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08rtl8192u: promote auth_mode to a full 8 bitsPaul Gortmaker1-2/+2
Currently LEAP is defined to two locally but the identically named global constant is 128 in <linux/ieee80211.h>. In order for us to switch over to using the global value, we need to adjust the local storage which is currently not enough to hold the larger value. This is now consistent with the similar struct used in drivers/net/wireless/ipw2x00/libipw.h and other drivers. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08rtl8192u: don't trample on <linux/ieee80211.h> struct namespacePaul Gortmaker8-127/+127
In order to start reducing the duplicated code/constants/macros in this driver, we need to include <linux/ieee80211.h> to provide the defacto versions. However this driver has structs with the same name as the ones in the main include, so namespace collision prevents us from doing step #1. Since the structs actually differ in their respective fields, we can't simply delete the local ones without impacting the runtime; a conversion to use the global ones can be considered at a later date if desired. Rename the ones here with a vendor specific prefix so that we won't have the namespace collision, and hence can continue on with the cleanup. Automated conversion done with: for i in `find . -name '*.[ch]'` ; do \ sed -i 's/struct ieee80211_hdr/struct rtl_80211_hdr/g' $i ; \ done Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08rtl8712: don't duplicate ieee80211 constants for status/reasonPaul Gortmaker1-29/+0
These are all defined as a part of the standard and should not be duplicated on a per-driver basis. Use the global ones and delete the local ones. It seems that ieee80211 was already included everywhere it was needed, since no explicit include <...> were needed to be added in order to preserve getting a successful compile. This isn't the totality of duplicated data removed, but it is a start. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08rtl8188eu: don't duplicate ieee80211 constants for status/reasonPaul Gortmaker6-109/+13
These are all defined as a part of the standard and should not be duplicated on a per-driver basis. Use the global ones and delete the local ones. Note that a couple of them had slight wording differences, things like INVALID vs. NOT_VALID or similar, so they are aligned with the global naming conventions here, as dictated by compile testing. This isn't the totality of duplicated data removed, but it is a start. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: vt6655: Checkpatch fix: lines longer than 80 columnsGuillaume Brogi1-15/+30
This patch fixes lines longer than 80 columns in mac.c. 5 lines longer than 80 columns remain for the sake of readability. Signed-off-by: Guillaume Brogi <gui-gui@netcourrier.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: sm7xxfb: remove unused functionsSudip Mukherjee1-32/+0
removed the smtc_alloc_fb_info() and smtc_free_fb_info() functions which were not used anymore. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: sm7xxfb: use framebuffer_alloc and releaseSudip Mukherjee1-98/+110
use the standard framebuffer_alloc() and framebuffer_release() instead of custom defined function. for making that change we had to change a member of the private structure from a variable to pointer and had to touch almost all places of the file. since fb was changed into a pointer so all instance of "sfb->fb." has been changed into "sfb->fb->". now we will get build warning about smtc_alloc_fb_info() and smtc_free_fb_info() to be unused which will be removed in the next patch of the series. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: gsc_hdpi: Remove dead codeGujulan Elango, Hari Prasath (H.)1-7/+0
This patch removes commented code from this driver. 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>
2015-05-08staging: fsl-mc: Remove redundant initalization of the .owner fieldGujulan Elango, Hari Prasath (H.)1-1/+0
This patch removes the redundant static initialization of the .owner field from this driver as it is being overidden by the call from the platform driver register Signed-off-by: Hari Prasath <hgujulan@visteon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: sm750: Fix the Makefile option errorBinbin Zhou1-1/+1
The sm750fb's Kconfig option is CONFIG_FB_SM750, not CONFIG_FB_SM7XX. Thus fix it to make the sm750fb can be built successfully. Signed-off-by: Binbin Zhou <zhoubb@lemote.com> Reviewed-by: Huacai Chen <chenhc@@lemote.com> Acked-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8188eu: remove commented codeLuca Ceresoli1-2/+2
This code is commented since the initial commit. Probably it is a remnant of old code. Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8188eu: remove useless commentLuca Ceresoli1-1/+0
"step 2" does mean much as there is no "step 1" stated anywhere... Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8188eu: fix lines over 80 charactersLuca Ceresoli1-7/+13
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8188eu: simplify nested ifsLuca Ceresoli1-5/+3
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8188eu: document enum where it is declaredLuca Ceresoli4-6/+6
The comment "/* open system */" is repeated verbatim in several places where dot11AuthAlgrthm_Open is referenced, but not where it is declared. Move it to be only at its declaration. This also fixes some "line over 80 characters" checkpatch warnings. Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8188eu: fix comments over 80 charactersLuca Ceresoli1-9/+29
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8188eu: remove duplicated commentsLuca Ceresoli1-2/+2
There are identical comments near the static variable declaration, around lines 118~120. Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08Staging: rtl8723au: hal: Remove trailing whitespace in odm.cEdward Lipinsky1-1/+1
This patch fixes the checkpatch.pl error: ERROR: trailing whitespace Signed-off-by: Edward Lipinsky <ellipinsky@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: dt3155v4l: remove unused including <linux/version.h>Wei Yongjun1-1/+0
Remove including <linux/version.h> that don't need it. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: android: ion_test: unregister the platform devicePhong Tran1-1/+7
The driver has to unregister from platform device when it's unloaded Signed-off-by: Phong Tran <tranmanphong@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: android: ion_test: unregister the misc devicePhong Tran1-0/+12
Add the remove() method for deregister from misc device when it's unloaded. Signed-off-by: Phong Tran <tranmanphong@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8192e: Fix DeviceID in rtl8192_pci_findadapter()Mateusz Kulikowski1-1/+1
rtl8192_pci_findadapter() was looking for invalid DeviceID (0x8172), instead of proper for rtl8192e/se devices (0x8192) Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8192e: Fix DEEP_INDENTATION warnings in rtl_dm.cMateusz Kulikowski1-85/+95
Separate parts of dm_TXPowerTrackingCallback_TSSI() into two new functions: - dm_tx_update_tssi_weak_signal() - dm_tx_update_tssi_strong_signal() Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8192e: Fix DEEP_INDENTATION warnings in rtllib_parse_info_param()Mateusz Kulikowski1-13/+8
- Replace ?: with min_t - Remove condition that is always true Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8192e: Fix LINE_SPACING warningMateusz Kulikowski1-0/+1
Trivial fix - add newline in dm_InitializeTXPowerTracking_TSSI() Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8192e: Remove bb tx gains from r8192_privMateusz Kulikowski4-551/+151
r8192_priv structure had 2 big arrays with tx gain register values: - cck_txbbgain_table - cck_txbbgain_ch14_table - txbbgain_table This arrays were read-only - filled in driver init code and look like firmware/chip-specific. This patch removes them from r8192_priv and puts them in (global) variables. tx_bb_gain is also flattened - register values are stored in array; Amplification value can be calculated using dm_tx_bb_gain_idx_to_amplify(). Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8192e: Fix SPACING errorsMateusz Kulikowski5-10/+9
Fix several SPACING errors to make checkpatch happy. Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8192e: remove r819xE_phyreg.hMateusz Kulikowski1-908/+0
This file is not used and its contents are duplicated in r8192E_phyreg.h. Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8192e: Copy comments from r819XE_phyreg.h to r8192E_phyreg.hMateusz Kulikowski1-27/+65
Both files have the same contents (with the exception of comments). One of them will not survive future commits. Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8192e: Fix SPACE_BEFORE_TAB warningsMateusz Kulikowski1-678/+678
Reformat r8192E_phyreg.h to make checkpatch happy. Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: rtl8192u: Make core functions staticNickolaus Woodruff1-7/+7
This patch fixes the following sparse warnings in r8192U_core.c: CHECK drivers/staging/rtl8192u/r8192U_core.c drivers/staging/rtl8192u/r8192U_core.c:3212:6: warning: symbol 'rtl819x_watchdog_wqcallback' was not declared. Should it be static? drivers/staging/rtl8192u/r8192U_core.c:3276:6: warning: symbol 'watch_dog_timer_callback' was not declared. Should it be static? drivers/staging/rtl8192u/r8192U_core.c:3282:5: warning: symbol '_rtl8192_up' was not declared. Should it be static? drivers/staging/rtl8192u/r8192U_core.c:3333:5: warning: symbol 'rtl8192_close' was not declared. Should it be static? drivers/staging/rtl8192u/r8192U_core.c:3406:6: warning: symbol 'rtl8192_restart' was not declared. Should it be static? drivers/staging/rtl8192u/r8192U_core.c:4618:6: warning: symbol 'rtl8192_irq_rx_tasklet' was not declared. Should it be static? drivers/staging/rtl8192u/r8192U_core.c:4736:6: warning: symbol 'rtl8192_cancel_deferred_work' was not declared. Should it be static? Signed-off-by: Nickolaus Woodruff <nickolauswoodruff@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: comedi: mite: use a better MODULE_DESCRIPTION()Ian Abbott1-1/+1
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>
2015-05-08staging: comedi: mite.h: whitespace changes in function declarationsIan Abbott1-10/+8
Reformat some function declarations to avoid bunching up near column 80. Also add a blank line after a `struct` definition. 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>
2015-05-08staging: comedi: mite.c: reformat commentsIan Abbott1-51/+54
Use the usual style for block comments. Squash double spaces after comment opening sequences. 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>
2015-05-08staging: comedi: mite.h: reformat some commentsIan Abbott1-29/+30
Use the usual style for block comments. Squash double spaces after comment opening sequences. 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>
2015-05-08staging: comedi: mite.h: remove "../comedi_pci.h" and make self-reliantIan Abbott1-1/+7
"mite.h" relies on a lot of things declared including "../comedi_pci.h", but doesn't need anything in "../comedi_pci.h" itself. None of the Comedi modules that include "mite.h" rely on it to include "../comedi_pci.h" on their behalf. Remove the inclusion of "../comedi_pci.h" from "mite.h", and add enough other includes and (incomplete) `struct` declarations to make it compile without warnings or errors even when included first in a .c 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>
2015-05-08staging: comedi: mite.c: remove commented out USE_KMALLOCIan Abbott1-2/+0
The definition of the macro `USE_KMALLOC` is commented out, and nothing refers to it. Remove the commented out macro. 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>
2015-05-08staging: comedi: mite.h: remove PCIMIO_COMPATIan Abbott1-2/+0
The macro `PCIMIO_COMPAT` is defined, but never used. Remove it. 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>
2015-05-08staging: comedi: mite: move #include <linux/slab.h>Ian Abbott2-1/+1
The Comedi driver modules build fine if the inclusion of <linux/slab.h> is removed from "mite.h", so remove it. However, since "mite.c" calls `kzalloc()`, include <linux/slab.h> there. 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>
2015-05-08staging: dgnc: remove redundant checkGiedrius Statkevičius1-6/+0
count doesn't get changed in between identical checks in dgnc_tty_write() so remove the second check Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-08staging: dgnc: remove dead code in dgnc_tty_write()Giedrius Statkevičius1-44/+1
Remove the dead code protected by in_user in dgnc_tty_write() because it is set to 0 and never changed to 1 thus the code in ifs never gets executed. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Copyright © 1996 – 2026 Jason A. Donenfeld. All Rights Reverse Engineered.