Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b43e726b authored Jul 03, 2008 by Jeremy Katz Committed by Herbert Xu Jul 10, 2008

crypto: padlock - Make module loading quieter when hardware isn't available



When loading aes or sha256 via the module aliases, the padlock modules
also try to get loaded.  Make the error message for them not being
present only be a NOTICE rather than an ERROR so that use of 'quiet'
will suppress the messages

Signed-off-by: Jeremy Katz <katzj@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 4b22f0dd

drivers/crypto/padlock-aes.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -385,12 +385,12 @@ static int __init padlock_init(void)
		int ret;

		if (!cpu_has_xcrypt) {
		printk(KERN_ERR PFX "VIA PadLock not detected.\n");
		printk(KERN_NOTICE 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");
		printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
		return -ENODEV;
		}

drivers/crypto/padlock-sha.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -254,12 +254,12 @@ static int __init padlock_init(void)
		int rc = -ENODEV;

		if (!cpu_has_phe) {
		printk(KERN_ERR PFX "VIA PadLock Hash Engine not detected.\n");
		printk(KERN_NOTICE PFX "VIA PadLock Hash Engine not detected.\n");
		return -ENODEV;
		}

		if (!cpu_has_phe_enabled) {
		printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
		printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
		return -ENODEV;
		}