OSDN Git Service
Roland Vossen [Tue, 5 Jul 2011 22:02:48 +0000 (00:02 +0200)]
staging: brcm80211: merged dngl_stats.h into dhd.h
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:47 +0000 (00:02 +0200)]
staging: brcm80211: deleted two fullmac source files
Having both a 'generic' as a 'linux' specific variant of a file makes
no sense in a Linux environment. Merged bcmsdh_sdmmc_linux.c into
bcmsdh_sdmmc.c, and bcmsdh_linux.c into bcmsdh.c.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:46 +0000 (00:02 +0200)]
staging: brcm80211: replaced Broadcom specific acronym WLC
WLC (caps) was replaced, wlc (small caps) has not been replaced yet.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Tue, 5 Jul 2011 22:02:45 +0000 (00:02 +0200)]
staging: brcm80211: remove checkpatch warnings from phy_n.c
The source file phy_n.c had couple of checkpatch warnings that
have been fixed in this patch.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Tue, 5 Jul 2011 22:02:44 +0000 (00:02 +0200)]
staging: brcm80211: made name lookup arrays more const
The checkpatch script gave a hint that some character string arrays
probably should have an additional const keyword. This patch changes
the static const char * arrays to static const char * const arrays as
suggested getting rid of two checkpatch warnings.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Tue, 5 Jul 2011 22:02:43 +0000 (00:02 +0200)]
staging: brcm80211: remove checkpatch warnings 'suspect code indent'
The driver sources contained a couple of checkpatch warnings of the
given class. These have been cleaned up.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:42 +0000 (00:02 +0200)]
staging: brcm80211: renamed structures in softmac
Several structures contained a '_c_' in their name that does not add any
information.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:41 +0000 (00:02 +0200)]
staging: brcm80211: replaced typedef tx_power_t by struct brcms_tx_power
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:40 +0000 (00:02 +0200)]
staging: brcm80211: replaced typedef wlc_phy_t with struct brcms_phy_pub
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:39 +0000 (00:02 +0200)]
staging: brcm80211: replaced typedef phy_info_t by struct brcms_phy
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:38 +0000 (00:02 +0200)]
staging: brcm80211: replaced various typedefs in softmac
typedefs are undesirable according to documentation/CodingStyle.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:37 +0000 (00:02 +0200)]
staging: brcm80211: removed remains of assert mechanism in fullmac
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:36 +0000 (00:02 +0200)]
staging: brcm80211: removed asserts from dhd_sdio.c
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:35 +0000 (00:02 +0200)]
staging: brcm80211: removed asserts from dhd_linux.c
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:34 +0000 (00:02 +0200)]
staging: brcm80211: removed asserts from dhd_cdc.c and dhd_common.c
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:33 +0000 (00:02 +0200)]
staging: brcm80211: removed asserts from bcmsdh.c
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:32 +0000 (00:02 +0200)]
staging: brcm80211: removed asserts from two fullmac files
ASSERTs are non desirable, replaced by error handling where applicable.
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Tue, 5 Jul 2011 22:02:31 +0000 (00:02 +0200)]
staging: brcm80211: rename macros in dhd_dbg.h
The header file dhd_dbg.h contains several macros used throughout
the code starting with DHD_. These have been renamed to get rid
of this broadcom specific acronym.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:30 +0000 (00:02 +0200)]
staging: brcm80211: removed unused #ifdef sections in fullmac
CONFIG_MACH_SANDGATE2G, CONFIG_MMC_MSM7X00A,
CONFIG_HAS_EARLYSUSPEND and CONFIG_WIFI_CONTROL_FUNC were never
defined.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 22:02:29 +0000 (00:02 +0200)]
staging: brcm80211: removed occurrences of 'dhd'
DHD is a Broadcom internal term and has been replaced by BRCMF.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Tue, 5 Jul 2011 22:02:28 +0000 (00:02 +0200)]
staging: brcm80211: clean up checkpatch error
A checkpatch error was introduced in following commit:
0f22b8a staging: brcm80211: remove MMC_SDIO_ABORT macro definition
The patch gets rid of the error.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tomas Winkler [Tue, 5 Jul 2011 18:07:47 +0000 (21:07 +0300)]
staging/easycap: kill telltale logic
This reason for this feature was
'some versions of the videodev module overwrite the data which has
been written by the call to usb_set_intfdata() in easycap_usb_probe(),
replacing it with a pointer to the embedded v4l2_device structure.
to detect this, the string in the easycap.telltale[] buffer is checked.'
The upstream version of v4l2_device_register sets driver data
only when it wasn't already set, therefore this is not needed
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Tue, 5 Jul 2011 20:06:17 +0000 (22:06 +0200)]
staging: brcm80211: rename external function in wl_cfg80211.c
Renamed external function getting rid of wl_ prefix. Removed unused
function from the API header file wl_cfg80211.h as it was not defined.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Tue, 5 Jul 2011 20:06:16 +0000 (22:06 +0200)]
staging: brcm80211: rename pointer conversion macros in wl_cfg80211.h
The data structures in fullmac driver references are made easier by
using provided macros in wl_cfg80211.h. The abbreviation 'wl' in these
macros has been replaced by cfg or the macro has been removed if used
only once.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Tue, 5 Jul 2011 20:06:15 +0000 (22:06 +0200)]
staging: brcm80211: rename structures and variables in wl_cfg80211.c
Making an effort getting rid of the wl_ prefix from the fullmac source
files.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:14 +0000 (22:06 +0200)]
staging: brcm80211: removed unused definitions from dhd_sdio.c
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:13 +0000 (22:06 +0200)]
staging: brcm80211: W_REG macro cleanup in fullmac SDIO
Code cleanup. W_REG was defined the same for both big and little endian systems.
Replaced W_REG on two spots with its expansion.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:12 +0000 (22:06 +0200)]
staging: brcm80211: removed last amd64 compiler warnings
Code cleanup. Warnings were due to pointer declarations being used for an
address that does not reside on the CPU bus.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:11 +0000 (22:06 +0200)]
staging: brcm80211: got rid of redundant member 'regs' of struct dhd_bus
Code cleanup. Decreases amd64 compiler warnings.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:10 +0000 (22:06 +0200)]
staging: brcm80211: replaced macro W_SDREG by function w_sdreg()
Code cleanup. Leads to more readable code and better type checking.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:09 +0000 (22:06 +0200)]
staging: brcm80211: replaced macro R_SDREG by function r_sdreg()
Code cleanup. Leads to more readable code and better type checking.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:08 +0000 (22:06 +0200)]
staging: brcm80211: fullmac register access macro's take u32 instead of pointers
Code cleanup. Fullmac contains macro's that access registers on the 32 bits
backplane bus. These registers should not be declared as pointers since
pointers can be 64 bits. The following patch series gets rid of these pointers
and ultimately of all compiler warning when compiling for amd64.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:07 +0000 (22:06 +0200)]
staging: brcm80211: removed unused code and definitions from fullmac
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:06 +0000 (22:06 +0200)]
staging: brcm80211: removed last typedefs from fullmac
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Tue, 5 Jul 2011 20:06:05 +0000 (22:06 +0200)]
staging: brcm80211: rename dhd_bus structure and functions
The header file dhd_bus.h contains several function prototypes
starting with dhd_bus_ and using parameter with struct dhd_bus.
These function and structure have been renamed to brcmf_bus.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Tue, 5 Jul 2011 20:06:04 +0000 (22:06 +0200)]
staging: brcm80211: rename function variables
This commit gets rid of variables whose name is a broadcom specific
acronym and not very meaningful.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:03 +0000 (22:06 +0200)]
staging: brcm80211: further cleaned fullmac header files
Code cleanup. Deleted unused definitions. Moved locally used definitions to
.c files. Moved definitions from bcmsdh_sdmmc.h to bcmsdbus.h.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:02 +0000 (22:06 +0200)]
staging: brcm80211: removed file sdiovar.h
Code cleanup. Contents merged into other files.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:01 +0000 (22:06 +0200)]
staging: brcm80211: removed brcmf_sdioh_start() and brcmf_sdioh_stop()
Code cleanup. These functions were empty.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:06:00 +0000 (22:06 +0200)]
staging: brcm80211: removed brcmf_sdioh_reset()
Code cleanup. This function did not perform a reset, hence it was removed.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:05:59 +0000 (22:05 +0200)]
staging: brcm80211: removed brcmf_sdioh_interrupt_pending()
Code cleanup. This function always returned 0.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:05:58 +0000 (22:05 +0200)]
staging: brcm80211: sdh related code cleanup
Gave struct brcmf_sdio the more applicable name 'brcmf_sdio_card'. Enforced
stronger type checking by replacing void *sdh by struct brcmf_sdio_card *.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 5 Jul 2011 20:05:57 +0000 (22:05 +0200)]
staging: brcm80211: removed last occurrences of bcmsdh/BCMSDH
Code cleanup. This was a Broadcom specific acronym.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 22:40:01 +0000 (00:40 +0200)]
Remove unneeded version.h includes from drivers/staging/rtl*/
It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/staging/rtl8187se/,
drivers/staging/rtl8192e/, drivers/staging/rtl8192u/ &
drivers/staging/rtl8712/.
This patch removes them.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 22:43:10 +0000 (00:43 +0200)]
Remove unneeded version.h include from drivers/staging/bcm/headers.h
It was pointed out by 'make versioncheck' that a include of
linux/version.h is not needed in drivers/staging/bcm/headers.h .
This patch removes it.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 22:44:07 +0000 (00:44 +0200)]
Remove unneeded version.h include from drivers/staging/cxd2099/cxd2099.c
It was pointed out by 'make versioncheck' that include of
linux/version.h is not needed in drivers/staging/cxd2099/cxd2099.c .
This patch removes it.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 22:47:43 +0000 (00:47 +0200)]
Remove unneeded version.h include from drivers/staging/cxt1e1/sbecom_inline_linux.h
It was pointed out by 'make versioncheck' that include of
linux/version.h is not needed in
drivers/staging/cxt1e1/sbecom_inline_linux.h
This patch removes it.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 22:51:12 +0000 (00:51 +0200)]
Remove unneeded version.h includes (and add where needed) for drivers/staging/easycap/
It was pointed out by 'make versioncheck' that linux/version.h was not
always being included where needed and sometimes included needlessly
in drivers/staging/easycap/.
This patch fixes up the includes.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 22:53:29 +0000 (00:53 +0200)]
Remove unneeded version.h includes from drivers/staging/lirc/
It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/staging/lirc/.
This patch removes them.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 22:56:26 +0000 (00:56 +0200)]
Remove unneeded version.h includes from drivers/staging/msm/
It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/staging/msm/.
This patch removes them.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 22:58:44 +0000 (00:58 +0200)]
Remove unneeded version.h include from drivers/staging/panel/panel.c
It was pointed out by 'make versioncheck' that include of
linux/version.h is not needed in drivers/staging/panel/panel.c
This patch removes it.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 23:00:24 +0000 (01:00 +0200)]
Remove unneeded version.h include from drivers/staging/rts_pstor/rtsx.h
It was pointed out by 'make versioncheck' that include of
linux/version.h is not needed in drivers/staging/rts_pstor/rtsx.h
This patch removes it.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 23:01:50 +0000 (01:01 +0200)]
Remove unneeded version.h includes from drivers/staging/speakup/
It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/staging/speakup/.
This patch removes them.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 23:02:55 +0000 (01:02 +0200)]
Remove unneeded version.h include from drivers/staging/tidspbridge/include/dspbridge/host_os.h
It was pointed out by 'make versioncheck' that include of
linux/version.h is not needed in
drivers/staging/tidspbridge/include/dspbridge/host_os.h
This patch removes it.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 23:04:19 +0000 (01:04 +0200)]
Remove unneeded version.h includes (and add where needed) for drivers/tm6000/
It was pointed out by 'make versioncheck' that linux/version.h was not
always being included where needed and sometimes included needlessly
in drivers/staging/tm6000/.
This patch fixes up the includes.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 23:05:44 +0000 (01:05 +0200)]
Remove unneeded version.h includes from drivers/staging/wlags49_h2/
It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/staging/wlags49_h2/.
This patch removes them.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 23:06:48 +0000 (01:06 +0200)]
Remove unneeded version.h include from drivers/staging/wlan-ng/prism2sta.c
It was pointed out by 'make versioncheck' that include of
linux/version.h is not needed in drivers/staging/wlan-ng/prism2sta.c .
This patch removes it.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 23 Jun 2011 23:08:05 +0000 (01:08 +0200)]
Remove unneeded version.h includes from drivers/staging/xgifb/
It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/staging/xgifb/.
This patch removes them.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Sat, 25 Jun 2011 17:14:21 +0000 (19:14 +0200)]
staging: ft1000: Merge common definitions from USB and PCMCIA drivers
Merge common definitions from ft1000-usb and ft1000-pcmcia drivers to
a common ft1000.h file.
This revealed two odd things in ft1000-usb which might be bugs so add
comments about them to ft1000_usb.h.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:57 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove support for v5 firmware
Remove support for v5 firmware images as all known firmware images are v6.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:56 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove PSEUDOSZ, use sizeof(struct pseudo_hdr) instead
PSEUDOSZ seems to define struct pseudo_hdr size.
Remove it and use sizeof(struct pseudo_hdr) directly.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:55 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: CodingStyle fixes in ft1000.h
Major CodingStyle fixes in ft1000.h
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:54 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove useless ft1000_release() function
Remove useless ft1000_release() function.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:53 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove unused includes from ft1000_cs.c
Remove unused includes from ft1000_cs.c
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:52 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: coding style fixes in ft1000_cs.c
Minor coding style fixes in ft1000_cs.c
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:51 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove unused ft1000_asic_read and ft1000_asic_write functions
Functions ft1000_asic_read() and ft1000_asic_write() are unused. Remove them.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:50 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove misleading and template comments from ft1000_cs.c
Remove misleading, useless and template comments from ft1000_cs.c
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:49 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove useless debugging from ft1000_cs.c
Remove useless debugging from ft1000_cs.c
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:48 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove useless defines from ft1000_cs.c
Remove unused defines from ft1000_cs.c
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:47 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove custom defines for standard types
Remove custom defines for standard types (u8, u16, u32...)
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:46 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove unused fields from struct ft1000_info
Remove 13 unused fields from struct ft1000_info.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:45 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove firmware download typedefs
Remove firmware download typedefs:
DFP_FILE_HDR, DSP_FILE_HDR_5, DSP_IMAGE_INFO, DSP_IMAGE_INFO_V6
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:44 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: delete local_info_t typedef
Delete local_info_t typedef along with the struct as its "link" member was
not used. Use link->priv to store net_device directly.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:43 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: delete unused DPRAM_BLK typedefs
Delete unused DPRAM_BLK typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:42 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove FT1000_INFO typedefs
Remove FT1000_INFO typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:41 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove PROV_RECORD typedefs
Remove PROV_RECORD typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:40 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: delete unused APP_INFO_BLOCK typedefs
Delete unused APP_INFO_BLOCK typedefs and associated variables.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:39 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: delete unused DSPHIBERNATE typedefs
Delete unused DSPHIBERNATE typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:38 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove DSPINITMSG typedefs
Remove DSPINITMSG typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:37 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: delete unused TIMEMSG typedefs
Delete unused TIMEMSG typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:36 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove MEDIAMSG typedefs
Remove MEDIAMSG typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:35 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove DRVMSG typedefs
Remove DRVMSG typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:34 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: remove PSEUDO_HDR typedefs
Remove PSEUDO_HDR typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:33 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: get rid of ft1000_dev.h
Shorten ft1000_read_reg() to single line and move it to ft1000.h along with
ft1000_write_reg() and delete ft1000_dev.h
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:32 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: delete ft1000.conf
Remove useless ft1000.conf file.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:31 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: fix compilation with FT_DEBUG enabled
Delete DEBUG statement that prevents compilation with FT_DEBUG enabled.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ondrej Zary [Thu, 30 Jun 2011 22:03:30 +0000 (00:03 +0200)]
staging: ft1000-pcmcia: don't crash on load
Don't crash with NULL pointer dereference on load because of empty .name.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Kirill Smelkov [Mon, 13 Jun 2011 12:18:32 +0000 (16:18 +0400)]
staging/easycap: Fix bytesperline calculation
As described above fillin_formats()
"""
/*
* THE 16-BIT easycap_format.mask HAS MEANING:
* (least significant) BIT 0: 0 => PAL, 25 FPS; 1 => NTSC, 30 FPS
* BITS 2-4: RESERVED FOR DIFFERENTIATING STANDARDS
* BITS 5-7: NUMBER OF BYTES PER PIXEL
* BIT 8: 0 => NATIVE BYTE ORDER; 1 => SWAPPED
* BITS 9-10: RESERVED FOR OTHER BYTE PERMUTATIONS
* BIT 11: 0 => UNDECIMATED; 1 => DECIMATED
* BIT 12: 0 => OFFER FRAMES; 1 => OFFER FIELDS
* BIT 13: 0 => FULL FRAMERATE; 1 => REDUCED
* (most significant) BITS 14-15: RESERVED FOR OTHER FIELD/FRAME OPTIONS
* IT FOLLOWS THAT:
* bytesperpixel IS ((0x00E0 & easycap_format.mask) >> 5)
* byteswaporder IS true IF (0 != (0x0100 & easycap_format.mask))
*
* decimatepixel IS true IF (0 != (0x0800 & easycap_format.mask))
*
* offerfields IS true IF (0 != (0x1000 & easycap_format.mask))
*/
"""
bytes-per-pixel is stored in bits 5-7 of calculated mask.
But when calculating bytes-per-line we were extracting wrong value
instead of bytes-per-pixel, which was usually 2 times bigger -- e.g. for
PAL YUV 422 I was getting ((mask3 & 0x00F0) >> 4) = 4 bytes instead of 2.
The error here is that even in comments there is a line saying
* bytesperpixel IS ((0x00E0 & easycap_format.mask) >> 5)
but we were using
((0x00F0 & easycap_format.mask) >> 4)
With 2 times bigger bytesperpixel and automatically bytesperline, the
video was shown halfheight'ed, which is understandable if we look at
video-memory layout:
<------- bytesperline -------->
<- real bpl ->
x0----------y0 x1-----------y1
x2----------y2 x3-----------y3
xn----------yn xn-----------yn
<garbage>
for each line, we should display width pixels, then move to next line
with bytesperline, and oops, if bytesperline = 2*real-bytesperlin, we'll
skip one line and move to next-next line, and so only half lines will be
shown.
Initially I've debugged the problem with my video application[1], but
I've checked that after this patch both rawv (mine app) and tvtime work
correctly.
[1] http://repo.or.cz/w/rawv.git
P.S. why at all we use those mask/shifts? Why not use bitfields?
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Kirill Smelkov [Mon, 13 Jun 2011 12:18:31 +0000 (16:18 +0400)]
staging/easycap: PAGE_SIZE is always defined
I'm not 100% sure, only 99.99% that PAGE_SIZE is always defined in
Linux. So there is no need to check for it.
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Kirill Smelkov [Mon, 13 Jun 2011 12:18:30 +0000 (16:18 +0400)]
staging/easycap: There is no need to support V4L1 ioctls
Because V4L1 was completly removed from the kernel in 2.6.38. See e.g.
08af245d ([media] V4L: remove V4L1 compatibility mode).
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Kirill Smelkov [Tue, 14 Jun 2011 16:46:49 +0000 (20:46 +0400)]
staging/easycap: Fix thinko in "bars" module option description
Both bars=0 and bars=1 were described as meaning to display bars on
signal lost. Actually bars=1 means "display bars", but bars=0 means
display raw source as is (usually black screen).
Instead of changing bars=0 to "_no_ testcard bars ..." as suggested by
Dan Carpenter reword the whole bars description for clarity.
Cc: Mike Thomas <rmthomas@sciolus.org>
Cc: Dan Carpenter <error27@gmail.com>
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Kirill Smelkov [Mon, 13 Jun 2011 12:18:28 +0000 (16:18 +0400)]
staging/easycap: Kill leftover build options in readme
The following options were removed from in-tree driver, but were left
in README:
- EASYCAP_IS_VIDEODEV_CLIENT was removed in
cb81fa07 (staging/easycap:
kill EASYCAP_IS_VIDEODEV_CLIENT compilation conditional);
- EASYCAP_NEEDS_V4L2_DEVICE_H/EASYCAP_NEEDS_V4L2_FOPS were removed in
30516058 (staging/easycap: kill EASYCAP_NEEDS_V4L2_DEVICE_H and
EASYCAP_NEEDS_V4L2_FOPS);
- EASYCAP_NEEDS_UNLOCKED_IOCTL was removed in
f2b3c685 (staging/easycap:
kill EASYCAP_NEEDS_UNLOCKED_IOCTL).
Remove them.
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Michael Fiedler [Mon, 20 Jun 2011 14:34:29 +0000 (16:34 +0200)]
staging: rtl8712: Add missing whitespace in struct definition
Fixes scripts/checkpatch.pl warning.
Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Michael Fiedler [Mon, 20 Jun 2011 14:34:28 +0000 (16:34 +0200)]
staging: rtl8712: Use linux/atomic.h instead of asm/atomic.h
Fixes warning from scripts/checkpatch.pl.
Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Michael Fiedler [Mon, 20 Jun 2011 14:34:27 +0000 (16:34 +0200)]
staging: rtl8712: Use __packed instead of __attribute__ ((packed))
According to scripts/checkpatch.pl, the __packed macro
from linux/compiler.h should be used.
Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Michael Fiedler [Mon, 20 Jun 2011 14:34:26 +0000 (16:34 +0200)]
staging: rtl8712: Remove duplicate #define for __attribute__ ((packed))
There is already a macro defined in linux/compiler.h.
Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dan Carpenter [Fri, 17 Jun 2011 10:25:09 +0000 (13:25 +0300)]
Staging: easycap: use after free in easycap_delete()
The JOM() macro dereferences peasycap, so I moved the free down some
lines.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tobias Klauser [Fri, 17 Jun 2011 08:53:54 +0000 (10:53 +0200)]
Staging: usbip: Fix out-of-tree build for userspace
This fixes out-of-tree builds ($builddir != $srcdir). In such cases,
libusbip.la cannot be found because it is generated in the build
directory and not the source directory.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Zac Storer [Sun, 19 Jun 2011 09:23:20 +0000 (03:23 -0600)]
Staging: keucr: usb: fixed a brace coding style warning
Fixed a brace coding style warning.
Signed-off-by: Zac Storer <zac.3.14159@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Larry Finger [Sun, 19 Jun 2011 03:34:34 +0000 (22:34 -0500)]
staging: r8192e_pci: Handle duplicate PCI ID 0x10ec:0x8192 conflict with rtl8192se
There are two devices with PCI ID 0x10ec:0x8192, namely RTL8192E and
RTL8192SE. The method of distinguishing them is by the revision ID
at offset 0x8 of the PCI configuration space. If the value is 0x10,
then the device uses rtl8192se for a driver.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>