tpm: Merge the tpm-bios module with tpm.o
PATCH 2/2 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.
--- drivers/char/tpm/Makefile | 7 +++---- drivers/char/tpm/tpm_eventlog.c | 3 --- drivers/char/tpm/tpm_ppi.c | 4 ---- 3 files changed, 3 insertions(+), 11 deletions(-)
This patch fits into the earlier posted series, see:
https://github.com/jgunthorpe/linux/commits/for-tpm
I have compile tested this on x86 with various options to confirm that both the ACPI and IBMVTPM paths work properly.
drivers/char/tpm/Makefile +3 -4
@@ -3,14 +3,13 @@ # obj-$(CONFIG_TCG_TPM) += tpm.o tpm-y := tpm-interface.o +tpm-$(CONFIG_ACPI) += tpm_ppi.o ifdef CONFIG_ACPI - obj-$(CONFIG_TCG_TPM) += tpm_bios.o - tpm_bios-objs += tpm_eventlog.o tpm_acpi.o tpm_ppi.o + tpm-y += tpm_eventlog.o tpm_acpi.o else ifdef CONFIG_TCG_IBMVTPM - obj-$(CONFIG_TCG_TPM) += tpm_bios.o - tpm_bios-objs += tpm_eventlog.o tpm_of.o + tpm-y += tpm_eventlog.o tpm_of.o endif endif obj-$(CONFIG_TCG_TIS) += tpm_tis.o
drivers/char/tpm/tpm_eventlog.c +0 -3
@@ -406,7 +406,6 @@ out_tpm: out:return NULL ; } -EXPORT_SYMBOL_GPL (tpm_bios_log_setup);void tpm_bios_log_teardown (struct dentry **lst) {
@@ -415,5 +414,3 @@ void tpm_bios_log_teardown(struct dentry **lst)for (i =0 ; i <3 ; i++)securityfs_remove (lst[i]); } -EXPORT_SYMBOL_GPL (tpm_bios_log_teardown); -MODULE_LICENSE ("GPL" );
drivers/char/tpm/tpm_ppi.c +0 -4
@@ -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" );
Signature · 1 line
1.8.1.2