The patch titled
tpm: spacing cleanups 2
has been added to the -mm tree. Its filename is
tpm-spacing-cleanups-2.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Kylene Jo Hall <kjhall@xxxxxxxxxx>
Fixes minor spacing issues.
Signed-off-by: Kylene Hall <kjhall@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/tpm/tpm_tis.c | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff -puN drivers/char/tpm/tpm_tis.c~tpm-spacing-cleanups-2 drivers/char/tpm/tpm_tis.c
--- devel/drivers/char/tpm/tpm_tis.c~tpm-spacing-cleanups-2 2006-04-18 23:48:24.000000000 -0700
+++ devel-akpm/drivers/char/tpm/tpm_tis.c 2006-04-18 23:48:24.000000000 -0700
@@ -54,8 +54,8 @@ enum tis_int_flags {
enum tis_defaults {
TIS_MEM_BASE = 0xFED4000,
TIS_MEM_LEN = 0x5000,
- TIS_SHORT_TIMEOUT = 750, /* ms */
- TIS_LONG_TIMEOUT = 2000, /* 2 sec */
+ TIS_SHORT_TIMEOUT = 750, /* ms */
+ TIS_LONG_TIMEOUT = 2000, /* 2 sec */
};
#define TPM_ACCESS(l) (0x0000 | ((l) << 12))
@@ -188,7 +188,7 @@ static int wait_for_stat(struct tpm_chip
return -ETIME;
}
-static int recv_data(struct tpm_chip *chip, u8 * buf, size_t count)
+static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
{
int size = 0, burstcnt;
while (size < count &&
@@ -206,7 +206,7 @@ static int recv_data(struct tpm_chip *ch
return size;
}
-static int tpm_tis_recv(struct tpm_chip *chip, u8 * buf, size_t count)
+static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)
{
int size = 0;
int expected, status;
@@ -257,7 +257,7 @@ out:
* tpm.c can skip polling for the data to be available as the interrupt is
* waited for here
*/
-static int tpm_tis_send(struct tpm_chip *chip, u8 * buf, size_t len)
+static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len)
{
int rc, status, burstcnt;
size_t count = 0;
@@ -374,8 +374,7 @@ static struct tpm_vendor_specific tpm_ti
.fops = &tis_ops,},
};
-static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs
- *regs)
+static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs *regs)
{
struct tpm_chip *chip = (struct tpm_chip *) dev_id;
u32 interrupt;
@@ -395,8 +394,7 @@ static irqreturn_t tis_int_probe(int irq
return IRQ_HANDLED;
}
-static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs
- *regs)
+static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs *regs)
{
struct tpm_chip *chip = (struct tpm_chip *) dev_id;
u32 interrupt;
@@ -426,10 +424,8 @@ static irqreturn_t tis_int_handler(int i
return IRQ_HANDLED;
}
-static int __devinit tpm_tis_pnp_init(struct pnp_dev
- *pnp_dev, const struct
- pnp_device_id
- *pnp_id)
+static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
+ const struct pnp_device_id *pnp_id)
{
u32 vendor, intfcaps, intmask;
int rc, i;
_
Patches currently in -mm which might be from kjhall@xxxxxxxxxx are
tpm-spacing-cleanups.patch
tpm-reorganize-sysfs-files.patch
tpm-chip-struct-update.patch
tpm-return-chip-from-tpm_register_hardware.patch
tpm-command-duration-update.patch
tpm-new-12-sysfs-files.patch
tpm-new-12-sysfs-files-fix.patch
tpm-new-12-sysfs-files-fix-fix.patch
tpm-tpm-new-12-sysfs-files-fix-fix-fix.patch
tpm-driver-for-next-generation-tpm-chips.patch
tpm-driver-for-next-generation-tpm-chips-fix.patch
tpm-driver-for-next-generation-tpm-chips-fix-fix.patch
tpm-msecs_to_jiffies-cleanups.patch
tpm-use-clear_bit.patch
tpm-use-clear_bit-fix.patch
tpm-use-clear_bit-fix-fix.patch
tpm-use-clear_bit-fix-fix-fix.patch
tpm-use-clear_bit-fix-fix-fix-fix.patch
tpm-tpm_infineon-updated-to-latest-interface-changes.patch
tpm-check-mem-start-and-len.patch
tpm-update-bios-log-code-for-12.patch
tpm_infineon-section-fixup.patch
tpm-spacing-cleanups-2.patch
tpm-add-interrupt-module-parameter.patch
tpm-add-hid-module-paramater.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
