[CRYPTO] padlock: Get rid of padlock-generic.c

Merge padlock-generic.c into padlock-aes.c and compile
AES as a standalone module. We won't make a monolithic
padlock.ko with all supported algorithms, instead we'll
compile each driver into its own module.

Signed-off-by: Michal Ludvig <michal@logix.cz>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Michal Ludvig
2006-08-06 22:46:20 +10:00
committed by Herbert Xu
parent b14cdd6704
commit 1191f0a493
4 changed files with 42 additions and 79 deletions

View File

@@ -495,15 +495,41 @@ static struct crypto_alg aes_alg = {
}
};
int __init padlock_init_aes(void)
static int __init padlock_init(void)
{
printk(KERN_NOTICE PFX "Using VIA PadLock ACE for AES algorithm.\n");
int ret;
if (!cpu_has_xcrypt) {
printk(KERN_ERR PFX "VIA PadLock not detected.\n");
return -ENODEV;
}
if (!cpu_has_xcrypt_enabled) {
printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
return -ENODEV;
}
gen_tabs();
return crypto_register_alg(&aes_alg);
if ((ret = crypto_register_alg(&aes_alg))) {
printk(KERN_ERR PFX "VIA PadLock AES initialization failed.\n");
return ret;
}
printk(KERN_NOTICE PFX "Using VIA PadLock ACE for AES algorithm.\n");
return ret;
}
void __exit padlock_fini_aes(void)
static void __exit padlock_fini(void)
{
crypto_unregister_alg(&aes_alg);
}
module_init(padlock_init);
module_exit(padlock_fini);
MODULE_DESCRIPTION("VIA PadLock AES algorithm support");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Michal Ludvig");
MODULE_ALIAS("aes-padlock");