Commits · 4ecc8c02cbd04a6dc6503013ed7ce1e5d4dc5cb7 · Kirill Smelkov / linux

09 Jan, 2014 40 commits

staging: wlags49_h2: remove some DBG_TRACE() calls · 4ecc8c02

Greg Kroah-Hartman authored Jan 09, 2014

These two calls were not needed, they were just debugging stuff.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4ecc8c02

staging: wlags49_h2: remove custom ways of creating a module name · cb7482bf

Greg Kroah-Hartman authored Jan 09, 2014

Just use KBUILD_MODNAME, don't try to hand-roll the same thing with odd
logic.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

cb7482bf

staging: wlags49_h2: remove PRINTK() · da61fde7

Greg Kroah-Hartman authored Jan 09, 2014

It was just a call to printk() so make that instead.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

da61fde7

staging: wlags49_h2: remove DBG_DEFN() · 66df924b

Greg Kroah-Hartman authored Jan 09, 2014

It didn't do anything, and no one called it, so remove it.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

66df924b

staging: wlags49_h2: remove DBG_TRAP() · 990cbe50

Greg Kroah-Hartman authored Jan 09, 2014

It didn't do anything, so just remove it, it's useless.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

990cbe50

staging: wlags49_h2: remove DBG_LEAVE() · 3c319c96

Greg Kroah-Hartman authored Jan 09, 2014

We have an in-kernel tracing function, use that instead if you really
need to figure out when functions are called and exited.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3c319c96

staging: wlags49_h2: remove DBG_ENTER() macro · b35360bc

Greg Kroah-Hartman authored Jan 09, 2014

We have an in-kernel tracing function, please use that instead of custom
macros.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

b35360bc

staging: wlags49_h2: remove empty DBG_FUNC() · 064d5a72

Greg Kroah-Hartman authored Jan 09, 2014

DBG_FUNC() didn't even do anything, so no need for it to be present in
the code at all.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

064d5a72

staging: wlags49_h2: remove some unused macros · fa43a20f

Greg Kroah-Hartman authored Jan 09, 2014

These macros were commented out, so just delete them as they are not
used anywhere.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

fa43a20f

staging: wlags49_h2: remove unneeded MODULE_DATE string · 265b3b83

Greg Kroah-Hartman authored Jan 09, 2014

This string makes no sense now that the driver is in the kernel, so
remove it.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

265b3b83

staging: rts5139: Drop print of build time · 0fcaf3bc

Josh Triplett authored Dec 23, 2013

The kernel already has this information, and individual drivers
shouldn't duplicate that.  This also eliminates the use of __TIME__,
which makes the build non-deterministic.  (And, without __DATE__,
__TIME__ provided little useful information to begin with.)
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

0fcaf3bc

staging: wlags49_h2: Drop debug macro recording build date/time · bf8c0f54

Josh Triplett authored Dec 23, 2013

The kernel already has this information, and individual drivers
shouldn't duplicate that.  This also eliminates the use of __DATE__ and
__TIME__, which make the build non-deterministic.
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

bf8c0f54

staging: usbip: userspace: add support for viewing imported devices · ec2ff627

Valentina Manea authored Jan 07, 2014

As of Matt Mooney's major refactoring in 2011, usbip port
option was left out. Add support for this option in
a manner similar to the old implementation.

Sample output:

Imported USB devices
====================
Port 00: <Port in Use> at Full Speed(12Mbps)
       unknown vendor : unknown product (1687:6211)
       2-1 -> usbip://192.168.122.152:3240/1-1
           -> remote bus/dev 001/002
Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Reviewed-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

ec2ff627

staging: r8188eu: Fix sparse warnings in core/rtw_br_ext.c · 55323187

Larry Finger authored Dec 22, 2013

Sparse lists the following:

CHECK drivers/staging/rtl8188eu/core/rtw_br_ext.c
drivers/staging/rtl8188eu/core/rtw_br_ext.c:700:101: warning: incorrect type in argument 2 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:700:101: expected unsigned int *ipxNetAddr
drivers/staging/rtl8188eu/core/rtw_br_ext.c:700:101: got restricted __be32 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:700:123: warning: incorrect type in argument 3 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:700:123: expected unsigned short *ipxSocketAddr
drivers/staging/rtl8188eu/core/rtw_br_ext.c:700:123: got restricted __be16 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:705:99: warning: incorrect type in argument 2 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:705:99: expected unsigned int *ipxNetAddr
drivers/staging/rtl8188eu/core/rtw_br_ext.c:705:99: got restricted __be32 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:714:101: warning: incorrect type in argument 2 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:714:101: expected unsigned int *ipxNetAddr
drivers/staging/rtl8188eu/core/rtw_br_ext.c:714:101: got restricted __be32 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:714:121: warning: incorrect type in argument 3 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:714:121: expected unsigned short *ipxSocketAddr
drivers/staging/rtl8188eu/core/rtw_br_ext.c:714:121: got restricted __be16 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:721:99: warning: incorrect type in argument 2 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:721:99: expected unsigned int *ipxNetAddr
drivers/staging/rtl8188eu/core/rtw_br_ext.c:721:99: got restricted __be32 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:749:83: warning: incorrect type in argument 2 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:749:83: expected unsigned short *network
drivers/staging/rtl8188eu/core/rtw_br_ext.c:749:83: got restricted __be16 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:762:83: warning: incorrect type in argument 2 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:762:83: expected unsigned short *network
drivers/staging/rtl8188eu/core/rtw_br_ext.c:762:83: got restricted __be16 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:783:83: warning: incorrect type in argument 2 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:783:83: expected unsigned short *network
drivers/staging/rtl8188eu/core/rtw_br_ext.c:783:83: got restricted __be16 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:795:83: warning: incorrect type in argument 2 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:795:83: expected unsigned short *network
drivers/staging/rtl8188eu/core/rtw_br_ext.c:795:83: got restricted __be16 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:849:57: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:849:57: expected unsigned short [unsigned] [short] <noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:849:57: got restricted __be16 [usertype] <noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:92:23: warning: restricted __be16 degrades to integer
drivers/staging/rtl8188eu/core/rtw_br_ext.c:876:95: warning: incorrect type in argument 3 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:876:95: expected unsigned short *sid
drivers/staging/rtl8188eu/core/rtw_br_ext.c:876:95: got restricted __be16 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:912:45: warning: cast to restricted __be16
drivers/staging/rtl8188eu/core/rtw_br_ext.c:912:45: warning: cast to restricted __be16
drivers/staging/rtl8188eu/core/rtw_br_ext.c:912:45: warning: cast to restricted __be16
drivers/staging/rtl8188eu/core/rtw_br_ext.c:912:45: warning: cast to restricted __be16
drivers/staging/rtl8188eu/core/rtw_br_ext.c:944:112: warning: incorrect type in argument 3 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:944:112: expected unsigned short *sid
drivers/staging/rtl8188eu/core/rtw_br_ext.c:944:112: got restricted __be16 *<noident>
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1019:84: warning: incorrect type in argument 3 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1019:84: expected unsigned int [unsigned] [usertype] len
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1019:84: got restricted __be16 [usertype] payload_len
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1021:110: warning: incorrect type in argument 2 (different base types)
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1021:110: expected int [signed] len
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1021:110: got restricted __be16 [usertype] payload_len
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1145:54: warning: cast to restricted __be32
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1145:54: warning: cast to restricted __be32
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1145:54: warning: cast to restricted __be32
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1145:54: warning: cast to restricted __be32
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1145:54: warning: cast to restricted __be32
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1145:54: warning: cast to restricted __be32
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1148:70: warning: restricted __be16 degrades to integer
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1154:70: warning: invalid assignment: |=
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1154:70: left side has type unsigned short
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1154:70: right side has type restricted __be16
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1157:64: warning: cast to restricted __be16
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1157:64: warning: cast to restricted __be16
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1157:64: warning: cast to restricted __be16
drivers/staging/rtl8188eu/core/rtw_br_ext.c:1157:64: warning: cast to restricted __be16
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

55323187

staging: r8188eu: Fix sparse warning in core/rtw_xmit.c · 7e83fd6d

Larry Finger authored Dec 22, 2013

Sparse reports the following warning:

CHECK drivers/staging/rtl8188eu/core/rtw_xmit.c
drivers/staging/rtl8188eu/core/rtw_xmit.c:809:23: warning: incorrect type in initializer (different base types)
drivers/staging/rtl8188eu/core/rtw_xmit.c:809:23: expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/core/rtw_xmit.c:809:23: got restricted __le16 *<noident>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

7e83fd6d

staging: r8188eu: Fix sparse warning in core/rtw_pwrctrl.c · 718aa548

Larry Finger authored Dec 22, 2013

Sparse reports the following:

CHECK drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c:525:6: warning: symbol 'rtw_free_pwrctrl_priv' was not declared. Should it be static?

That routine is not used and has been deleted.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

718aa548

staging: r8188eu: Fix sparse warning in core/rtw_sta_mgt.c · 1f8e635f

Larry Finger authored Dec 22, 2013

Sparse reports the following:

CHECK drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c:152:6: warning: symbol 'rtw_mfree_all_stainfo' was not declared. Should it be static?
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1f8e635f

staging: r8188eu: Eliminate enum ODM_RADIO_PATH in favor of rf_radio_path · cc25137f

Larry Finger authored Dec 22, 2013

There are two different enum statements that have been combined.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

cc25137f

staging: r8188eu: Cleanup of include/hal_intf.h · 5fd5ca57

Larry Finger authored Dec 22, 2013

This driver only handles RTL8188EU with USB interface, thus several hardware
defines and macros can be removed.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

5fd5ca57

staging: r8188eu: Additional cleanup of include/odm.h · f395036d

Larry Finger authored Dec 22, 2013

This driver only works with the USB bus. Accordingly, enum odm_interface_def
can be removed along with all code that uses ODM_ITRF_XXX, where XXX is not USB.

In enum odm_ic_type, only ODM_RTL8188E is used. Remove the enum, all references
to the others, and define the needed value.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

f395036d

staging: r8188eu: Remove unneeded prototypes from include/odm.h · e02a0089

Larry Finger authored Dec 22, 2013

This header contains a number of routines that do not to be available
globally. Once this change was made, a number of the routines were not
used, and could be removed.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

e02a0089

staging: r8188eu: Simplify code related to SupportICType · 6c0a555e

Larry Finger authored Dec 22, 2013

This member of struct odm_dm_struct is always set to ODM_RTL8188E for this
driver. Accordingly, the code can be simplified. A number of routines
now are no longer needed and are deleted.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

6c0a555e

staging: r8188eu: Simplify code concerning SupportPlatform · 0735ea67

Larry Finger authored Dec 22, 2013

This member of struct odm_dm_struct is always set to ODM_CE in this driver.
As a result, a number of switch and if statements can be simplified. In
addition, a number of routines are no longer used and can be removed.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

0735ea67

staging: r8188eu: Remove even more empty routines · e96031d0

Larry Finger authored Dec 22, 2013

This patch removes the following:

odm_DynamicTxPowerAP
odm_RSSIMonitorCheckMP
odm_RSSIMonitorCheckAP
odm_TXPowerTrackingCheckMP
odm_TXPowerTrackingCheckAP
odm_SwAntDivInit
ODM_SwAntDivChkPerPktRssi
odm_SwAntDivChkAntSwitch
ODM_SwAntDivRestAfterLink
dm_GlobalAdapterCheck
odm_dtc
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

e96031d0

staging: r8188eu: Remove more empty routines · 36298867

Larry Finger authored Dec 22, 2013

This batch includes

ODM_StartWorkItem
ODM_StopWorkItem
ODM_FreeWorkItem
ODM_AcquireSpinLoc
ODM_ReleaseSpinLock
ODM_ReleaseTimer
ODM_ReleaseAllTimers
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

36298867

staging: r8188eu: Remove - number of dummy and unused routines · 9ec6f1d2

Larry Finger authored Dec 22, 2013

These routines include:
ODM_StartWorkItem()
ODM_StopWorkItem()
ODM_FreeWorkItem()
ODM_ScheduleWorkItem()
ODM_IsWorkItemScheduled()
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

9ec6f1d2

staging: r8188eu: Remove macro ODM_GetMACReg · 3b6de322

Larry Finger authored Dec 22, 2013

This is equivalent to PHY_GetBBReg.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3b6de322

staging: r8188eu: Remove macro ODM_SetMACReg · f4f320e6

Larry Finger authored Dec 22, 2013

This is the same as macro PHY_SetBBReg.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

f4f320e6

staging: r8188eu: Remove macro ODM_GetRFReg · 5ec55c52

Larry Finger authored Dec 22, 2013

This one is a duplicate od macro PHY_QueryRFReg.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

5ec55c52

staging: r8188eu: Remove macro ODM_SetRFReg · 5b7230b1

Larry Finger authored Dec 22, 2013

It is a duplicate of macro PHY_SetRFReg.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

5b7230b1

staging: r8188eu: Remove macro ODM_GetBBReg · 25aacb2a

Larry Finger authored Dec 22, 2013

This one is a duplicate of PHY_QueryBBReg.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

25aacb2a

staging: r8188eu: Remove macro ODM_SetBBReg · e690895a

Larry Finger authored Dec 22, 2013

It is essentially a duplicate of macro PHY_SetBBReg
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

e690895a

staging: r8188eu: Remove wrapper around mutex_destroy · 4b33d52a

Larry Finger authored Dec 22, 2013

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4b33d52a

staging: r8188eu: Remove wrappers _rtw_free_sema, _rtw_up_sema, and _rtw_mutex_init · 2ca4ab53

Larry Finger authored Dec 22, 2013

Any routines that are empty as a result of these changes are also removed.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2ca4ab53

staging: r8188eu: Replace wrapper around sema_init · efbef100

Larry Finger authored Dec 22, 2013

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

efbef100

staging: r8188eu: Remove daemonize conditional · 47e589ee

Larry Finger authored Dec 22, 2013

The current kernels do not include this entry point. Delete the call.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

47e589ee

staging: r8188eu: Replace wrappers for atomic_inc and atomic_inc_return · 762595e5

Larry Finger authored Dec 22, 2013

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

762595e5

staging: r8188eu: Remove unused atomic_xxx wrappers · e7abd806

Larry Finger authored Dec 22, 2013

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

e7abd806

staging: r8188eu: Replace wrapper around atomic_set() · fac4ed8c

Larry Finger authored Dec 22, 2013

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

fac4ed8c

staging: r8188eu: Replace ATOMIC_T with atomic_t · 6fe58d68

Larry Finger authored Dec 22, 2013

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

6fe58d68