s390: crypto driver.
Subsystems (2)
PATCH 7/10 s390: crypto driver.
[patch 7/10] s390: crypto driver.
From: Eric Rossman <[email protected]>
s390 crypto driver changes:
- Small cleanup: misc -> crypto, header file defines, variable names and a printk message.
Signed-off-by Martin Schwidefsky <[email protected]>
diffstat:
drivers/s390/crypto/Makefile | 2 +- drivers/s390/crypto/z90common.h | 8 ++++---- drivers/s390/crypto/z90crypt.h | 10 +++++----- drivers/s390/crypto/z90hardware.c | 6 +++--- drivers/s390/crypto/z90main.c | 16 ++++++++-------- 5 files changed, 21 insertions(+), 21 deletions(-)
drivers/s390/crypto/Makefile +1 -1
@@ -1,5 +1,5 @@ # -# S/390 miscellaneous devices +# S/390 crypto devices # z90crypt-objs := z90main.o z90hardware.o
drivers/s390/crypto/z90common.h +4 -4
@@ -1,5 +1,5 @@/* -* linux/drivers/s390/misc/z90common.h +* linux/drivers/s390/crypto/z90common.h * * z90crypt 1.3.2 *
@@ -24,10 +24,10 @@* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _Z90COMMON_ -#define _Z90COMMON_ +#ifndef _Z90COMMON_H_ +#define _Z90COMMON_H_ -#define VERSION_Z90COMMON_H "$Revision: 1.15 $" +#define VERSION_Z90COMMON_H "$Revision: 1.16 $"#define RESPBUFFSIZE 256
drivers/s390/crypto/z90crypt.h +5 -5
@@ -1,5 +1,5 @@/* -* linux/drivers/s390/misc/z90crypt.h +* linux/drivers/s390/crypto/z90crypt.h * * z90crypt 1.3.2 *
@@ -24,12 +24,12 @@* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _LINUX_Z90CRYPT_H_ -#define _LINUX_Z90CRYPT_H_ +#ifndef _Z90CRYPT_H_ +#define _Z90CRYPT_H_#include <linux/ioctl.h> -#define VERSION_Z90CRYPT_H "$Revision: 1.10 $" +#define VERSION_Z90CRYPT_H "$Revision: 1.11 $"#define z90crypt_VERSION 1#define z90crypt_RELEASE 3 // 2 = PCIXCC, 3 = rewrite for coding standards
@@ -255,4 +255,4 @@ unsigned char qdepth[MASK_LENGTH]; }; -#endif /* _LINUX_Z90CRYPT_H_ */ +#endif /* _Z90CRYPT_H_ */
drivers/s390/crypto/z90hardware.c +3 -3
@@ -1,5 +1,5 @@/* -* linux/drivers/s390/misc/z90hardware.c +* linux/drivers/s390/crypto/z90hardware.c * * z90crypt 1.3.2 *
@@ -32,9 +32,9 @@#include "z90crypt.h" #include "z90common.h" -#define VERSION_Z90HARDWARE_C "$Revision: 1.32 $" +#define VERSION_Z90HARDWARE_C "$Revision: 1.33 $" -char z90chardware_version[]__initdata = +char z90hardware_version[]__initdata ="z90hardware.o (" VERSION_Z90HARDWARE_C "/" VERSION_Z90COMMON_H "/" VERSION_Z90CRYPT_H ")" ;
drivers/s390/crypto/z90main.c +8 -8
@@ -1,5 +1,5 @@/* -* linux/drivers/s390/misc/z90main.c +* linux/drivers/s390/crypto/z90main.c * * z90crypt 1.3.2 *
@@ -51,13 +51,13 @@# error "This kernel is too recent: not supported by this file"#endif -#define VERSION_Z90MAIN_C "$Revision: 1.54 $" +#define VERSION_Z90MAIN_C "$Revision: 1.57 $" -static char z90cmain_version[]__initdata = +static char z90main_version[]__initdata ="z90main.o (" VERSION_Z90MAIN_C "/" VERSION_Z90COMMON_H "/" VERSION_Z90CRYPT_H ")" ; -extern char z90chardware_version[]; +extern char z90hardware_version[];/** * Defaults that may be modified.
@@ -97,7 +97,7 @@* older than CLEANUPTIME seconds in the past. */ #ifndef CLEANUPTIME -#define CLEANUPTIME 15 +#define CLEANUPTIME 20#endif /**
@@ -670,8 +670,8 @@PRINTKN ("Version %d.%d.%d loaded, built on %s %s\n" , z90crypt_VERSION, z90crypt_RELEASE, z90crypt_VARIANT, __DATE__, __TIME__); -PRINTKN ("%s\n" , z90cmain_version); -PRINTKN ("%s\n" , z90chardware_version); +PRINTKN ("%s\n" , z90main_version); +PRINTKN ("%s\n" , z90hardware_version);PDEBUG ("create_z90crypt (domain index %d) successful.\n" , domain); }else
@@ -2372,7 +2372,7 @@break ; }if (dev_ptr->dev_self_x != index) { -PRINTK ("Corrupt dev ptr in receive_from_AP\n" ); +PRINTKC ("Corrupt dev ptr\n" ); z90crypt.terminating =1 ; rv =REC_FATAL_ERROR ;break ;