summaryrefslogtreecommitdiff
path: root/drivers/char/tpm/tpm_ppi.c
diff options
context:
space:
mode:
authorJason Gunthorpe <jgunthorpe@obsidianresearch.com>2013-10-03 08:51:09 +0400
committerPeter Huewe <peterhuewe@gmx.de>2013-10-22 21:43:01 +0400
commit187eea0c353abd4ffa3a9cc86a660af9605fcb10 (patch)
tree056d3de6e71f68ef6aeb5bb2d024fac3af5ff5da /drivers/char/tpm/tpm_ppi.c
parent9deb0eb7cad450cd942a0eca11a198f6d24cb3d4 (diff)
downloadlinux-187eea0c353abd4ffa3a9cc86a660af9605fcb10.tar.xz
tpm: Merge the tpm-bios module with tpm.o
Now that we can have multiple .c files in the tpm module there is no reason for tpm-bios. tpm-bios exported several functions: tpm_bios_log_setup, tpm_bios_log_teardown, tpm_add_ppi, and tpm_remove_ppi. They are only used by tpm, and if tpm-bios is built then tpm will unconditionally require them. Further, tpm-bios does nothing on its own, it has no module_init function. Thus we remove the exports and merge the modules to simplify things. The Makefile conditions are changed slightly to match the code, tpm_ppi is always required if CONFIG_ACPI is set. Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Diffstat (limited to 'drivers/char/tpm/tpm_ppi.c')
-rw-r--r--drivers/char/tpm/tpm_ppi.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c
index 2168d15bc728..8e562dc65601 100644
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
@@ -452,12 +452,8 @@ int tpm_add_ppi(struct kobject *parent)
{
return sysfs_create_group(parent, &ppi_attr_grp);
}
-EXPORT_SYMBOL_GPL(tpm_add_ppi);
void tpm_remove_ppi(struct kobject *parent)
{
sysfs_remove_group(parent, &ppi_attr_grp);
}
-EXPORT_SYMBOL_GPL(tpm_remove_ppi);
-
-MODULE_LICENSE("GPL");