diff options
| author | Ashley Lai | 2012-09-12 19:49:50 +0200 |
|---|---|---|
| committer | Kent Yoder | 2012-11-01 21:23:14 +0100 |
| commit | b5666502700855a1eb1a15482005b22478b9460e (patch) | |
| tree | a0cefa93ace73f06a5fdf29b9b1235416c48947d /drivers/char/tpm/tpm_ibmvtpm.h | |
| parent | Merge branch 'security-next-keys' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | kernel-qcow2-linux-b5666502700855a1eb1a15482005b22478b9460e.tar.gz kernel-qcow2-linux-b5666502700855a1eb1a15482005b22478b9460e.tar.xz kernel-qcow2-linux-b5666502700855a1eb1a15482005b22478b9460e.zip | |
drivers/char/tpm: remove tasklet and cleanup
This patch removed the tasklet and moved the wait queue into the
private structure. It also cleaned up the response CRQ path.
Signed-off-by: Ashley Lai <adlai@us.ibm.com>
Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/char/tpm/tpm_ibmvtpm.h')
| -rw-r--r-- | drivers/char/tpm/tpm_ibmvtpm.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/tpm/tpm_ibmvtpm.h b/drivers/char/tpm/tpm_ibmvtpm.h index 4296eb4b4d82..bd82a791f995 100644 --- a/drivers/char/tpm/tpm_ibmvtpm.h +++ b/drivers/char/tpm/tpm_ibmvtpm.h @@ -38,13 +38,12 @@ struct ibmvtpm_dev { struct vio_dev *vdev; struct ibmvtpm_crq_queue crq_queue; dma_addr_t crq_dma_handle; - spinlock_t lock; - struct tasklet_struct tasklet; u32 rtce_size; void __iomem *rtce_buf; dma_addr_t rtce_dma_handle; spinlock_t rtce_lock; - struct ibmvtpm_crq crq_res; + wait_queue_head_t wq; + u16 res_len; u32 vtpm_version; }; |