aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKylene Jo Hall <kjhall@us.ibm.com>2006-04-22 05:36:56 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-22 12:19:53 -0400
commit3c2f606a098b07f053904ec8b8f4d0e101c28b35 (patch)
treea113074d8051ed3452e8eae5b7d5ddb569258960 /drivers
parent7c69a47f1badf40dfa2febac71df98d32b1b56d7 (diff)
[PATCH] tpm: spacing cleanups
The following patch set contains numerous changes to the base tpm driver (tpm.c) to support the next generation of TPM chips. The changes include new sysfs files because of more relevant data being available, a function to access the timeout and duration values for the chip, and changes to make use of those duration values. Duration in the TPM specification is defined as the maximum amount of time the chip could take to return the results. Commands are in one of three categories short, medium and long. Also included are cleanups of how the commands for the sysfs files are composed to reduce a bunch of redundant arrays. This patch: Fix minor spacing issues. Signed-off-by: Kylene Hall <kjhall@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/tpm/tpm.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 5a3870477ef1..379c5d465579 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -46,7 +46,7 @@ static void user_reader_timeout(unsigned long ptr)
46 schedule_work(&chip->work); 46 schedule_work(&chip->work);
47} 47}
48 48
49static void timeout_work(void * ptr) 49static void timeout_work(void *ptr)
50{ 50{
51 struct tpm_chip *chip = ptr; 51 struct tpm_chip *chip = ptr;
52 52
@@ -387,7 +387,7 @@ int tpm_release(struct inode *inode, struct file *file)
387EXPORT_SYMBOL_GPL(tpm_release); 387EXPORT_SYMBOL_GPL(tpm_release);
388 388
389ssize_t tpm_write(struct file *file, const char __user *buf, 389ssize_t tpm_write(struct file *file, const char __user *buf,
390 size_t size, loff_t * off) 390 size_t size, loff_t *off)
391{ 391{
392 struct tpm_chip *chip = file->private_data; 392 struct tpm_chip *chip = file->private_data;
393 int in_size = size, out_size; 393 int in_size = size, out_size;
@@ -419,11 +419,10 @@ ssize_t tpm_write(struct file *file, const char __user *buf,
419 419
420 return in_size; 420 return in_size;
421} 421}
422
423EXPORT_SYMBOL_GPL(tpm_write); 422EXPORT_SYMBOL_GPL(tpm_write);
424 423
425ssize_t tpm_read(struct file * file, char __user *buf, 424ssize_t tpm_read(struct file *file, char __user *buf,
426 size_t size, loff_t * off) 425 size_t size, loff_t *off)
427{ 426{
428 struct tpm_chip *chip = file->private_data; 427 struct tpm_chip *chip = file->private_data;
429 int ret_size; 428 int ret_size;