tpm: tpm_tis_i2c: Simplify init code
authorSimon Glass <sjg@chromium.org>
Sun, 23 Aug 2015 00:31:28 +0000 (18:31 -0600)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 10 Sep 2015 10:19:17 +0000 (12:19 +0200)
Move all the init and uninit code into one place.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Christophe Ricard<christophe-h.ricard@st.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
drivers/tpm/tpm_tis_i2c.c

index 39652a9..9dd40dd 100644 (file)
@@ -608,27 +608,6 @@ out:
        return rc;
 }
 
-static int tpm_open_dev(struct udevice *dev)
-{
-       int rc;
-
-       debug("%s: start\n", __func__);
-       if (g_chip.is_open)
-               return -EBUSY;
-       rc = tpm_tis_i2c_init(dev);
-       if (rc < 0)
-               g_chip.is_open = 0;
-       return rc;
-}
-
-static void tpm_close(void)
-{
-       if (g_chip.is_open) {
-               release_locality(&g_chip, g_chip.locality, 1);
-               g_chip.is_open = 0;
-       }
-}
-
 /**
  * Decode TPM configuration.
  *
@@ -712,7 +691,12 @@ int tis_open(void)
        if (!g_chip.inited)
                return -1;
 
-       rc = tpm_open_dev(g_chip.dev);
+       debug("%s: start\n", __func__);
+       if (g_chip.is_open)
+               return -EBUSY;
+       rc = tpm_tis_i2c_init(g_chip.dev);
+       if (rc < 0)
+               g_chip.is_open = 0;
 
        return rc;
 }
@@ -722,7 +706,10 @@ int tis_close(void)
        if (!g_chip.inited)
                return -1;
 
-       tpm_close();
+       if (g_chip.is_open) {
+               release_locality(&g_chip, g_chip.locality, 1);
+               g_chip.is_open = 0;
+       }
 
        return 0;
 }