Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
f6094990
Commit
f6094990
authored
Jul 14, 2011
by
Larry Finger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
staging: rtl8192e: Remove dead code associated with CONFIG_RTL_RFKILL
Signed-off-by:
Larry Finger
<
Larry.Finger@lwfinger.net
>
parent
c9d9a801
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
23 deletions
+0
-23
drivers/staging/rtl8192e/rtl_core.c
drivers/staging/rtl8192e/rtl_core.c
+0
-16
drivers/staging/rtl8192e/rtl_core.h
drivers/staging/rtl8192e/rtl_core.h
+0
-7
No files found.
drivers/staging/rtl8192e/rtl_core.c
View file @
f6094990
...
@@ -1147,11 +1147,7 @@ static void rtl8192_init_priv_handler(struct net_device* dev)
...
@@ -1147,11 +1147,7 @@ static void rtl8192_init_priv_handler(struct net_device* dev)
priv
->
rtllib
->
ScanOperationBackupHandler
=
PHY_ScanOperationBackup8192
;
priv
->
rtllib
->
ScanOperationBackupHandler
=
PHY_ScanOperationBackup8192
;
#ifdef CONFIG_RTL_RFKILL
priv
->
rtllib
->
rtllib_rfkill_poll
=
rtl8192_rfkill_poll
;
#else
priv
->
rtllib
->
rtllib_rfkill_poll
=
NULL
;
priv
->
rtllib
->
rtllib_rfkill_poll
=
NULL
;
#endif
}
}
static
void
rtl8192_init_priv_constant
(
struct
net_device
*
dev
)
static
void
rtl8192_init_priv_constant
(
struct
net_device
*
dev
)
...
@@ -3056,15 +3052,6 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
...
@@ -3056,15 +3052,6 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
if
(
priv
->
polling_timer_on
==
0
){
if
(
priv
->
polling_timer_on
==
0
){
check_rfctrl_gpio_timer
((
unsigned
long
)
dev
);
check_rfctrl_gpio_timer
((
unsigned
long
)
dev
);
}
}
#ifdef CONFIG_RTL_RFKILL
if
(
priv
->
ops
->
init_before_adapter_start
)
{
priv
->
ops
->
init_before_adapter_start
(
dev
);
priv
->
initialized_at_probe
=
true
;
}
if
(
!
rtl8192_rfkill_init
(
dev
))
{
goto
fail1
;
}
#endif
RT_TRACE
(
COMP_INIT
,
"Driver probe completed
\n
"
);
RT_TRACE
(
COMP_INIT
,
"Driver probe completed
\n
"
);
return
0
;
return
0
;
...
@@ -3099,9 +3086,6 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
...
@@ -3099,9 +3086,6 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
struct
net_device
*
dev
=
pci_get_drvdata
(
pdev
);
struct
net_device
*
dev
=
pci_get_drvdata
(
pdev
);
struct
r8192_priv
*
priv
;
struct
r8192_priv
*
priv
;
if
(
dev
){
if
(
dev
){
#ifdef CONFIG_RTL_RFKILL
rtl8192_rfkill_exit
(
dev
);
#endif
unregister_netdev
(
dev
);
unregister_netdev
(
dev
);
priv
=
rtllib_priv
(
dev
);
priv
=
rtllib_priv
(
dev
);
...
...
drivers/staging/rtl8192e/rtl_core.h
View file @
f6094990
...
@@ -56,10 +56,6 @@
...
@@ -56,10 +56,6 @@
#include "r8190P_def.h"
#include "r8190P_def.h"
#include "r8192E_dev.h"
#include "r8192E_dev.h"
#ifdef CONFIG_RTL_RFKILL
#include "rtl_rfkill.h"
#endif
#include "rtl_debug.h"
#include "rtl_debug.h"
#include "rtl_eeprom.h"
#include "rtl_eeprom.h"
#include "rtl_ps.h"
#include "rtl_ps.h"
...
@@ -678,9 +674,6 @@ typedef struct r8192_priv
...
@@ -678,9 +674,6 @@ typedef struct r8192_priv
u8
RegCWinMin
;
u8
RegCWinMin
;
u8
keepAliveLevel
;
u8
keepAliveLevel
;
#ifdef CONFIG_RTL_RFKILL
bool
rfkill_off
;
#endif
bool
sw_radio_on
;
bool
sw_radio_on
;
bool
bHwRadioOff
;
bool
bHwRadioOff
;
bool
pwrdown
;
bool
pwrdown
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment