diff mbox series

[09/42] tpm: remove init() class method

Message ID 20171009225623.29232-10-marcandre.lureau@redhat.com
State New
Headers show
Series TPM: code cleanup & CRB device | expand

Commit Message

Marc-André Lureau Oct. 9, 2017, 10:55 p.m. UTC
No backend use it.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 include/sysemu/tpm_backend.h | 2 --
 backends/tpm.c               | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

Comments

Stefan Berger Oct. 10, 2017, 3:30 p.m. UTC | #1
On 10/09/2017 06:55 PM, Marc-André Lureau wrote:
> No backend use it.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

> ---
>   include/sysemu/tpm_backend.h | 2 --
>   backends/tpm.c               | 4 +---
>   2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
> index a4288df038..b08f985500 100644
> --- a/include/sysemu/tpm_backend.h
> +++ b/include/sysemu/tpm_backend.h
> @@ -66,8 +66,6 @@ struct TPMBackendClass {
>   
>       TPMBackend *(*create)(QemuOpts *opts, const char *id);
>   
> -    /* initialize the backend */
> -    int (*init)(TPMBackend *t);
>       /* start up the TPM on the backend */
>       int (*startup_tpm)(TPMBackend *t);
>   
> diff --git a/backends/tpm.c b/backends/tpm.c
> index ca3a78eea8..dc750d48c9 100644
> --- a/backends/tpm.c
> +++ b/backends/tpm.c
> @@ -47,13 +47,11 @@ enum TpmType tpm_backend_get_type(TPMBackend *s)
>   int tpm_backend_init(TPMBackend *s, TPMState *state,
>                        TPMRecvDataCB *datacb)
>   {
> -    TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
> -
>       s->tpm_state = state;
>       s->recv_data_callback = datacb;
>       s->had_startup_error = false;
>   
> -    return k->init ? k->init(s) : 0;
> +    return 0;
>   }
>   
>   int tpm_backend_startup_tpm(TPMBackend *s)
diff mbox series

Patch

diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index a4288df038..b08f985500 100644
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -66,8 +66,6 @@  struct TPMBackendClass {
 
     TPMBackend *(*create)(QemuOpts *opts, const char *id);
 
-    /* initialize the backend */
-    int (*init)(TPMBackend *t);
     /* start up the TPM on the backend */
     int (*startup_tpm)(TPMBackend *t);
 
diff --git a/backends/tpm.c b/backends/tpm.c
index ca3a78eea8..dc750d48c9 100644
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -47,13 +47,11 @@  enum TpmType tpm_backend_get_type(TPMBackend *s)
 int tpm_backend_init(TPMBackend *s, TPMState *state,
                      TPMRecvDataCB *datacb)
 {
-    TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
-
     s->tpm_state = state;
     s->recv_data_callback = datacb;
     s->had_startup_error = false;
 
-    return k->init ? k->init(s) : 0;
+    return 0;
 }
 
 int tpm_backend_startup_tpm(TPMBackend *s)