aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorKylene Jo Hall <kjhall@us.ibm.com>2006-04-22 05:39:31 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-22 12:19:55 -0400
commitcb5354253af2bc30ed449b8be4b3bddf3b3a2746 (patch)
tree7539b366004bf570b91e45b728f15947735eb551 /drivers/char
parent397c718299d848ff305ecd955838a9bd32f1f881 (diff)
[PATCH] tpm: spacing cleanups 2
Fixes 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/char')
-rw-r--r--drivers/char/tpm/tpm_tis.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 9c0727bf28b7..398514745d3f 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -54,8 +54,8 @@ enum tis_int_flags {
54enum tis_defaults { 54enum tis_defaults {
55 TIS_MEM_BASE = 0xFED4000, 55 TIS_MEM_BASE = 0xFED4000,
56 TIS_MEM_LEN = 0x5000, 56 TIS_MEM_LEN = 0x5000,
57 TIS_SHORT_TIMEOUT = 750, /* ms */ 57 TIS_SHORT_TIMEOUT = 750, /* ms */
58 TIS_LONG_TIMEOUT = 2000, /* 2 sec */ 58 TIS_LONG_TIMEOUT = 2000, /* 2 sec */
59}; 59};
60 60
61#define TPM_ACCESS(l) (0x0000 | ((l) << 12)) 61#define TPM_ACCESS(l) (0x0000 | ((l) << 12))
@@ -188,7 +188,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
188 return -ETIME; 188 return -ETIME;
189} 189}
190 190
191static int recv_data(struct tpm_chip *chip, u8 * buf, size_t count) 191static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
192{ 192{
193 int size = 0, burstcnt; 193 int size = 0, burstcnt;
194 while (size < count && 194 while (size < count &&
@@ -206,7 +206,7 @@ static int recv_data(struct tpm_chip *chip, u8 * buf, size_t count)
206 return size; 206 return size;
207} 207}
208 208
209static int tpm_tis_recv(struct tpm_chip *chip, u8 * buf, size_t count) 209static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)
210{ 210{
211 int size = 0; 211 int size = 0;
212 int expected, status; 212 int expected, status;
@@ -257,7 +257,7 @@ out:
257 * tpm.c can skip polling for the data to be available as the interrupt is 257 * tpm.c can skip polling for the data to be available as the interrupt is
258 * waited for here 258 * waited for here
259 */ 259 */
260static int tpm_tis_send(struct tpm_chip *chip, u8 * buf, size_t len) 260static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len)
261{ 261{
262 int rc, status, burstcnt; 262 int rc, status, burstcnt;
263 size_t count = 0; 263 size_t count = 0;
@@ -374,8 +374,7 @@ static struct tpm_vendor_specific tpm_tis = {
374 .fops = &tis_ops,}, 374 .fops = &tis_ops,},
375}; 375};
376 376
377static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs 377static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs *regs)
378 *regs)
379{ 378{
380 struct tpm_chip *chip = (struct tpm_chip *) dev_id; 379 struct tpm_chip *chip = (struct tpm_chip *) dev_id;
381 u32 interrupt; 380 u32 interrupt;
@@ -395,8 +394,7 @@ static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs
395 return IRQ_HANDLED; 394 return IRQ_HANDLED;
396} 395}
397 396
398static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs 397static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs *regs)
399 *regs)
400{ 398{
401 struct tpm_chip *chip = (struct tpm_chip *) dev_id; 399 struct tpm_chip *chip = (struct tpm_chip *) dev_id;
402 u32 interrupt; 400 u32 interrupt;
@@ -426,10 +424,8 @@ static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs
426 return IRQ_HANDLED; 424 return IRQ_HANDLED;
427} 425}
428 426
429static int __devinit tpm_tis_pnp_init(struct pnp_dev 427static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
430 *pnp_dev, const struct 428 const struct pnp_device_id *pnp_id)
431 pnp_device_id
432 *pnp_id)
433{ 429{
434 u32 vendor, intfcaps, intmask; 430 u32 vendor, intfcaps, intmask;
435 int rc, i; 431 int rc, i;