Skip to content

Commit cb53542

Browse files
Kylene Jo HallLinus Torvalds
authored andcommitted
[PATCH] tpm: spacing cleanups 2
Fixes minor spacing issues. Signed-off-by: Kylene Hall <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 397c718 commit cb53542

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

drivers/char/tpm/tpm_tis.c

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ enum tis_int_flags {
5454
enum tis_defaults {
5555
TIS_MEM_BASE = 0xFED4000,
5656
TIS_MEM_LEN = 0x5000,
57-
TIS_SHORT_TIMEOUT = 750, /* ms */
58-
TIS_LONG_TIMEOUT = 2000, /* 2 sec */
57+
TIS_SHORT_TIMEOUT = 750, /* ms */
58+
TIS_LONG_TIMEOUT = 2000, /* 2 sec */
5959
};
6060

6161
#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,
188188
return -ETIME;
189189
}
190190

191-
static int recv_data(struct tpm_chip *chip, u8 * buf, size_t count)
191+
static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
192192
{
193193
int size = 0, burstcnt;
194194
while (size < count &&
@@ -206,7 +206,7 @@ static int recv_data(struct tpm_chip *chip, u8 * buf, size_t count)
206206
return size;
207207
}
208208

209-
static int tpm_tis_recv(struct tpm_chip *chip, u8 * buf, size_t count)
209+
static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)
210210
{
211211
int size = 0;
212212
int expected, status;
@@ -257,7 +257,7 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 * buf, size_t count)
257257
* tpm.c can skip polling for the data to be available as the interrupt is
258258
* waited for here
259259
*/
260-
static int tpm_tis_send(struct tpm_chip *chip, u8 * buf, size_t len)
260+
static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len)
261261
{
262262
int rc, status, burstcnt;
263263
size_t count = 0;
@@ -374,8 +374,7 @@ static struct tpm_vendor_specific tpm_tis = {
374374
.fops = &tis_ops,},
375375
};
376376

377-
static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs
378-
*regs)
377+
static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs *regs)
379378
{
380379
struct tpm_chip *chip = (struct tpm_chip *) dev_id;
381380
u32 interrupt;
@@ -395,8 +394,7 @@ static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs
395394
return IRQ_HANDLED;
396395
}
397396

398-
static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs
399-
*regs)
397+
static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs *regs)
400398
{
401399
struct tpm_chip *chip = (struct tpm_chip *) dev_id;
402400
u32 interrupt;
@@ -426,10 +424,8 @@ static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs
426424
return IRQ_HANDLED;
427425
}
428426

429-
static int __devinit tpm_tis_pnp_init(struct pnp_dev
430-
*pnp_dev, const struct
431-
pnp_device_id
432-
*pnp_id)
427+
static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
428+
const struct pnp_device_id *pnp_id)
433429
{
434430
u32 vendor, intfcaps, intmask;
435431
int rc, i;

0 commit comments

Comments
 (0)