From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon, 9 Oct 2017 22:55:51 +0000 (+0200)
Subject: tpm: remove configure_tpm() hop
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=76ae76bfea67ca972d1158dfdea07e27e4c0852e;p=qemu.git

tpm: remove configure_tpm() hop

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---

diff --git a/tpm.c b/tpm.c
index 4882501bd7..45520f555d 100644
--- a/tpm.c
+++ b/tpm.c
@@ -86,7 +86,7 @@ TPMBackend *qemu_find_tpm(const char *id)
     return NULL;
 }
 
-static int configure_tpm(QemuOpts *opts)
+static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)
 {
     const char *value;
     const char *id;
@@ -145,11 +145,6 @@ static int configure_tpm(QemuOpts *opts)
     return 0;
 }
 
-static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)
-{
-    return configure_tpm(opts);
-}
-
 /*
  * Walk the list of TPM backend drivers that are in use and call their
  * destroy function to have them cleaned up.