Commit 24553f2d authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds

[PATCH] s390: crypto driver

From: Eric Rossman <edrossma@us.ibm.com>

s390 crypto driver changes:
 - Small cleanup: misc -> crypto, header file defines,
   variable names and a printk message.
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9a574bbd
# #
# S/390 miscellaneous devices # S/390 crypto devices
# #
z90crypt-objs := z90main.o z90hardware.o z90crypt-objs := z90main.o z90hardware.o
......
/* /*
* linux/drivers/s390/misc/z90common.h * linux/drivers/s390/crypto/z90common.h
* *
* z90crypt 1.3.2 * z90crypt 1.3.2
* *
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifndef _Z90COMMON_ #ifndef _Z90COMMON_H_
#define _Z90COMMON_ #define _Z90COMMON_H_
#define VERSION_Z90COMMON_H "$Revision: 1.15 $" #define VERSION_Z90COMMON_H "$Revision: 1.16 $"
#define RESPBUFFSIZE 256 #define RESPBUFFSIZE 256
......
/* /*
* linux/drivers/s390/misc/z90crypt.h * linux/drivers/s390/crypto/z90crypt.h
* *
* z90crypt 1.3.2 * z90crypt 1.3.2
* *
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifndef _LINUX_Z90CRYPT_H_ #ifndef _Z90CRYPT_H_
#define _LINUX_Z90CRYPT_H_ #define _Z90CRYPT_H_
#include <linux/ioctl.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_VERSION 1
#define z90crypt_RELEASE 3 // 2 = PCIXCC, 3 = rewrite for coding standards #define z90crypt_RELEASE 3 // 2 = PCIXCC, 3 = rewrite for coding standards
...@@ -255,4 +255,4 @@ struct ica_z90_status { ...@@ -255,4 +255,4 @@ struct ica_z90_status {
unsigned char qdepth[MASK_LENGTH]; unsigned char qdepth[MASK_LENGTH];
}; };
#endif /* _LINUX_Z90CRYPT_H_ */ #endif /* _Z90CRYPT_H_ */
/* /*
* linux/drivers/s390/misc/z90hardware.c * linux/drivers/s390/crypto/z90hardware.c
* *
* z90crypt 1.3.2 * z90crypt 1.3.2
* *
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
#include "z90crypt.h" #include "z90crypt.h"
#include "z90common.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 "/" "z90hardware.o (" VERSION_Z90HARDWARE_C "/"
VERSION_Z90COMMON_H "/" VERSION_Z90CRYPT_H ")"; VERSION_Z90COMMON_H "/" VERSION_Z90CRYPT_H ")";
......
/* /*
* linux/drivers/s390/misc/z90main.c * linux/drivers/s390/crypto/z90main.c
* *
* z90crypt 1.3.2 * z90crypt 1.3.2
* *
...@@ -51,13 +51,13 @@ ...@@ -51,13 +51,13 @@
# error "This kernel is too recent: not supported by this file" # error "This kernel is too recent: not supported by this file"
#endif #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 "/" "z90main.o (" VERSION_Z90MAIN_C "/"
VERSION_Z90COMMON_H "/" VERSION_Z90CRYPT_H ")"; VERSION_Z90COMMON_H "/" VERSION_Z90CRYPT_H ")";
extern char z90chardware_version[]; extern char z90hardware_version[];
/** /**
* Defaults that may be modified. * Defaults that may be modified.
...@@ -97,7 +97,7 @@ extern char z90chardware_version[]; ...@@ -97,7 +97,7 @@ extern char z90chardware_version[];
* older than CLEANUPTIME seconds in the past. * older than CLEANUPTIME seconds in the past.
*/ */
#ifndef CLEANUPTIME #ifndef CLEANUPTIME
#define CLEANUPTIME 15 #define CLEANUPTIME 20
#endif #endif
/** /**
...@@ -670,8 +670,8 @@ z90crypt_init_module(void) ...@@ -670,8 +670,8 @@ z90crypt_init_module(void)
PRINTKN("Version %d.%d.%d loaded, built on %s %s\n", PRINTKN("Version %d.%d.%d loaded, built on %s %s\n",
z90crypt_VERSION, z90crypt_RELEASE, z90crypt_VARIANT, z90crypt_VERSION, z90crypt_RELEASE, z90crypt_VARIANT,
__DATE__, __TIME__); __DATE__, __TIME__);
PRINTKN("%s\n", z90cmain_version); PRINTKN("%s\n", z90main_version);
PRINTKN("%s\n", z90chardware_version); PRINTKN("%s\n", z90hardware_version);
PDEBUG("create_z90crypt (domain index %d) successful.\n", PDEBUG("create_z90crypt (domain index %d) successful.\n",
domain); domain);
} else } else
...@@ -2372,7 +2372,7 @@ receive_from_crypto_device(int index, unsigned char *psmid, int *buff_len_p, ...@@ -2372,7 +2372,7 @@ receive_from_crypto_device(int index, unsigned char *psmid, int *buff_len_p,
break; break;
} }
if (dev_ptr->dev_self_x != index) { if (dev_ptr->dev_self_x != index) {
PRINTK("Corrupt dev ptr in receive_from_AP\n"); PRINTKC("Corrupt dev ptr\n");
z90crypt.terminating = 1; z90crypt.terminating = 1;
rv = REC_FATAL_ERROR; rv = REC_FATAL_ERROR;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment