diff options
author | Jason Gunthorpe <jgunthorpe@obsidianresearch.com> | 2013-10-03 00:51:09 -0400 |
---|---|---|
committer | Peter Huewe <peterhuewe@gmx.de> | 2013-10-22 13:43:01 -0400 |
commit | 187eea0c353abd4ffa3a9cc86a660af9605fcb10 (patch) | |
tree | 056d3de6e71f68ef6aeb5bb2d024fac3af5ff5da /drivers/char/tpm/tpm_ppi.c | |
parent | 9deb0eb7cad450cd942a0eca11a198f6d24cb3d4 (diff) |
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.c | 4 |
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) | |||
452 | { | 452 | { |
453 | return sysfs_create_group(parent, &ppi_attr_grp); | 453 | return sysfs_create_group(parent, &ppi_attr_grp); |
454 | } | 454 | } |
455 | EXPORT_SYMBOL_GPL(tpm_add_ppi); | ||
456 | 455 | ||
457 | void tpm_remove_ppi(struct kobject *parent) | 456 | void tpm_remove_ppi(struct kobject *parent) |
458 | { | 457 | { |
459 | sysfs_remove_group(parent, &ppi_attr_grp); | 458 | sysfs_remove_group(parent, &ppi_attr_grp); |
460 | } | 459 | } |
461 | EXPORT_SYMBOL_GPL(tpm_remove_ppi); | ||
462 | |||
463 | MODULE_LICENSE("GPL"); | ||