tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by Kylene Jo Hall and committed by Linus Torvalds cb535425 397c7182

+9 -13
unified split
+9 -13
drivers/char/tpm/tpm_tis.c
··· 54 enum tis_defaults { 55 TIS_MEM_BASE = 0xFED4000, 56 TIS_MEM_LEN = 0x5000, 57 - TIS_SHORT_TIMEOUT = 750, /* ms */ 58 - TIS_LONG_TIMEOUT = 2000, /* 2 sec */ 59 }; 60 61 #define TPM_ACCESS(l) (0x0000 | ((l) << 12)) ··· 188 return -ETIME; 189 } 190 191 - static int recv_data(struct tpm_chip *chip, u8 * buf, size_t count) 192 { 193 int size = 0, burstcnt; 194 while (size < count && ··· 206 return size; 207 } 208 209 - static int tpm_tis_recv(struct tpm_chip *chip, u8 * buf, size_t count) 210 { 211 int size = 0; 212 int expected, status; ··· 257 * tpm.c can skip polling for the data to be available as the interrupt is 258 * waited for here 259 */ 260 - static int tpm_tis_send(struct tpm_chip *chip, u8 * buf, size_t len) 261 { 262 int rc, status, burstcnt; 263 size_t count = 0; ··· 374 .fops = &tis_ops,}, 375 }; 376 377 - static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs 378 - *regs) 379 { 380 struct tpm_chip *chip = (struct tpm_chip *) dev_id; 381 u32 interrupt; ··· 394 return IRQ_HANDLED; 395 } 396 397 - static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs 398 - *regs) 399 { 400 struct tpm_chip *chip = (struct tpm_chip *) dev_id; 401 u32 interrupt; ··· 424 return IRQ_HANDLED; 425 } 426 427 - static int __devinit tpm_tis_pnp_init(struct pnp_dev 428 - *pnp_dev, const struct 429 - pnp_device_id 430 - *pnp_id) 431 { 432 u32 vendor, intfcaps, intmask; 433 int rc, i;
··· 54 enum tis_defaults { 55 TIS_MEM_BASE = 0xFED4000, 56 TIS_MEM_LEN = 0x5000, 57 + TIS_SHORT_TIMEOUT = 750, /* ms */ 58 + TIS_LONG_TIMEOUT = 2000, /* 2 sec */ 59 }; 60 61 #define TPM_ACCESS(l) (0x0000 | ((l) << 12)) ··· 188 return -ETIME; 189 } 190 191 + static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count) 192 { 193 int size = 0, burstcnt; 194 while (size < count && ··· 206 return size; 207 } 208 209 + static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count) 210 { 211 int size = 0; 212 int expected, status; ··· 257 * tpm.c can skip polling for the data to be available as the interrupt is 258 * waited for here 259 */ 260 + static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len) 261 { 262 int rc, status, burstcnt; 263 size_t count = 0; ··· 374 .fops = &tis_ops,}, 375 }; 376 377 + static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs *regs) 378 { 379 struct tpm_chip *chip = (struct tpm_chip *) dev_id; 380 u32 interrupt; ··· 395 return IRQ_HANDLED; 396 } 397 398 + static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs *regs) 399 { 400 struct tpm_chip *chip = (struct tpm_chip *) dev_id; 401 u32 interrupt; ··· 426 return IRQ_HANDLED; 427 } 428 429 + static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev, 430 + const struct pnp_device_id *pnp_id) 431 { 432 u32 vendor, intfcaps, intmask; 433 int rc, i;