From: Andrew Morton <akpm@linux-foundation.org>

Cc: Kylene Hall <kjhall@us.ibm.com>
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/char/tpm/tpm.c |   23 -----------------------
 1 file changed, 23 deletions(-)

diff -puN drivers/char/tpm/tpm.c~integrity-tpm-internal-kernel-interface-tidy drivers/char/tpm/tpm.c
--- a/drivers/char/tpm/tpm.c~integrity-tpm-internal-kernel-interface-tidy
+++ a/drivers/char/tpm/tpm.c
@@ -365,7 +365,6 @@ unsigned long tpm_calc_ordinal_duration(
 	else
 		return duration;
 }
-
 EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);
 
 /*
@@ -427,7 +426,6 @@ out:
 	up(&chip->tpm_mutex);
 	return rc;
 }
-
 EXPORT_SYMBOL_GPL(tpm_transmit);
 
 #define TPM_DIGEST_SIZE 20
@@ -504,7 +502,6 @@ void tpm_gen_interrupt(struct tpm_chip *
 	rc = transmit_cmd(chip, data, sizeof(data),
 			  "attempting to determine the timeouts");
 }
-
 EXPORT_SYMBOL_GPL(tpm_gen_interrupt);
 
 void tpm_get_timeouts(struct tpm_chip *chip)
@@ -571,7 +568,6 @@ duration:
 			     (*((__be32 *) (data +
 					    TPM_GET_CAP_RET_UINT32_3_IDX))));
 }
-
 EXPORT_SYMBOL_GPL(tpm_get_timeouts);
 
 void tpm_continue_selftest(struct tpm_chip *chip)
@@ -584,7 +580,6 @@ void tpm_continue_selftest(struct tpm_ch
 
 	tpm_transmit(chip, data, sizeof(data));
 }
-
 EXPORT_SYMBOL_GPL(tpm_continue_selftest);
 
 /*
@@ -610,7 +605,6 @@ ssize_t tpm_show_enabled(struct device *
 		return 0;
 	return sprintf(buf, "%d\n", !data[TPM_GET_CAP_PERM_DISABLE_IDX]);
 }
-
 EXPORT_SYMBOL_GPL(tpm_show_enabled);
 
 /*
@@ -636,7 +630,6 @@ ssize_t tpm_show_active(struct device * 
 		return 0;
 	return sprintf(buf, "%d\n", !data[TPM_GET_CAP_PERM_INACTIVE_IDX]);
 }
-
 EXPORT_SYMBOL_GPL(tpm_show_active);
 
 /*
@@ -662,7 +655,6 @@ ssize_t tpm_show_owned(struct device * d
 		return 0;
 	return sprintf(buf, "%d\n", data[TPM_GET_CAP_RET_BOOL_1_IDX]);
 }
-
 EXPORT_SYMBOL_GPL(tpm_show_owned);
 
 /*
@@ -688,7 +680,6 @@ ssize_t tpm_show_temp_deactivated(struct
 		return 0;
 	return sprintf(buf, "%d\n", data[TPM_GET_CAP_TEMP_INACTIVE_IDX]);
 }
-
 EXPORT_SYMBOL_GPL(tpm_show_temp_deactivated);
 
 #define READ_PCR_RESULT_SIZE 30
@@ -739,7 +730,6 @@ ssize_t tpm_show_pcrs(struct device *dev
 out:
 	return str - buf;
 }
-
 EXPORT_SYMBOL_GPL(tpm_show_pcrs);
 
 /*
@@ -798,7 +788,6 @@ int tpm_pcr_read(u32 chip_id, int pcr_id
 	return rc;
 
 }
-
 EXPORT_SYMBOL_GPL(tpm_pcr_read);
 
 #define EXTEND_PCR_SIZE 34
@@ -837,7 +826,6 @@ int tpm_pcr_extend(u32 chip_id, int pcr_
 		rc = be32_to_cpu(*((u32 *) (data + 6)));
 	return rc;
 }
-
 EXPORT_SYMBOL_GPL(tpm_pcr_extend);
 
 #define  READ_PUBEK_RESULT_SIZE 314
@@ -905,7 +893,6 @@ out:
 	kfree(data);
 	return rc;
 }
-
 EXPORT_SYMBOL_GPL(tpm_show_pubek);
 
 #define CAP_VERSION_1_1 6
@@ -962,7 +949,6 @@ ssize_t tpm_show_caps(struct device *dev
 out:
 	return str - buf;
 }
-
 EXPORT_SYMBOL_GPL(tpm_show_caps);
 
 /*
@@ -1011,7 +997,6 @@ ssize_t tpm_show_caps_1_2(struct device 
 out:
 	return str - buf;
 }
-
 EXPORT_SYMBOL_GPL(tpm_show_caps_1_2);
 
 /*
@@ -1027,7 +1012,6 @@ ssize_t tpm_store_cancel(struct device *
 	chip->vendor.cancel(chip);
 	return count;
 }
-
 EXPORT_SYMBOL_GPL(tpm_store_cancel);
 
 /*
@@ -1079,7 +1063,6 @@ err_out:
 	spin_unlock(&driver_lock);
 	return rc;
 }
-
 EXPORT_SYMBOL_GPL(tpm_open);
 
 int tpm_release(struct inode *inode, struct file *file)
@@ -1131,7 +1114,6 @@ ssize_t tpm_write(struct file *file, con
 
 	return in_size;
 }
-
 EXPORT_SYMBOL_GPL(tpm_write);
 
 ssize_t tpm_read(struct file * file, char __user * buf,
@@ -1156,7 +1138,6 @@ ssize_t tpm_read(struct file * file, cha
 
 	return ret_size;
 }
-
 EXPORT_SYMBOL_GPL(tpm_read);
 
 void tpm_remove_hardware(struct device *dev)
@@ -1187,7 +1168,6 @@ void tpm_remove_hardware(struct device *
 
 	put_device(dev);
 }
-
 EXPORT_SYMBOL_GPL(tpm_remove_hardware);
 
 static u8 savestate[] = {
@@ -1209,7 +1189,6 @@ int tpm_pm_suspend(struct device *dev, p
 	tpm_transmit(chip, savestate, sizeof(savestate));
 	return 0;
 }
-
 EXPORT_SYMBOL_GPL(tpm_pm_suspend);
 
 /*
@@ -1225,7 +1204,6 @@ int tpm_pm_resume(struct device *dev)
 
 	return 0;
 }
-
 EXPORT_SYMBOL_GPL(tpm_pm_resume);
 
 /*
@@ -1316,7 +1294,6 @@ struct tpm_chip *tpm_register_hardware(s
 
 	return chip;
 }
-
 EXPORT_SYMBOL_GPL(tpm_register_hardware);
 
 MODULE_AUTHOR("Leendert van Doorn (leendert@watson.ibm.com)");
_