Skip to content

Commit

Permalink
staging: rtl8192e: Remove dead code associated with BUILT_IN_CRYPTO
Browse files Browse the repository at this point in the history
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
  • Loading branch information
Larry Finger authored and Larry Finger committed Aug 24, 2011
1 parent 954b609 commit dc5de47
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 46 deletions.
10 changes: 0 additions & 10 deletions drivers/staging/rtl8192e/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,6 @@
#include <linux/sched.h>
#include <asm/kmap_types.h>

#ifdef BUILT_IN_CRYPTO
#ifdef CONFIG_CRYPTO_HMAC
#undef CONFIG_CRYPTO_HMAC
#endif

#ifdef CONFIG_KMOD
#undef CONFIG_KMOD
#endif
#endif /* BUILT_IN_CRYPTO */

extern enum km_type crypto_km_types[];

static inline enum km_type crypto_kmap_type(int out)
Expand Down
26 changes: 0 additions & 26 deletions drivers/staging/rtl8192e/rtl_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3255,26 +3255,6 @@ static int __init rtl8192_pci_module_init(void)
int ret;
int error;

#ifdef BUILT_IN_CRYPTO
ret = arc4_init();
if (ret) {
printk(KERN_ERR "arc4_init() failed %d\n", ret);
return ret;
}


ret = michael_mic_init();
if (ret) {
printk(KERN_ERR "michael_mic_init() failed %d\n", ret);
return ret;
}

ret = aes_init();
if (ret) {
printk(KERN_ERR "aes_init() failed %d\n", ret);
return ret;
}
#endif
ret = rtllib_init();
if (ret) {
printk(KERN_ERR "rtllib_init() failed %d\n", ret);
Expand Down Expand Up @@ -3333,12 +3313,6 @@ static void __exit rtl8192_pci_module_exit(void)
rtllib_crypto_wep_exit();
rtllib_crypto_deinit();
rtllib_exit();
#ifdef BUILT_IN_CRYPTO
arc4_exit();
michael_mic_exit();
aes_fini();
#endif

}

void check_rfctrl_gpio_timer(unsigned long data)
Expand Down
10 changes: 0 additions & 10 deletions drivers/staging/rtl8192e/rtl_crypto.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,6 @@
#include <asm/page.h>
#include <asm/errno.h>

#ifdef BUILT_IN_CRYPTO
#ifdef CONFIG_CRYPTO_HMAC
#undef CONFIG_CRYPTO_HMAC
#endif

#ifdef CONFIG_KMOD
#undef CONFIG_KMOD
#endif
#endif /* BUILT_IN_CRYPTO */

#define crypto_register_alg crypto_register_alg_rsl
#define crypto_unregister_alg crypto_unregister_alg_rsl
#define crypto_alloc_tfm crypto_alloc_tfm_rsl
Expand Down

0 comments on commit dc5de47

Please sign in to comment.