[PATCH v2 04/10] tpm/tpm_i2c_stm_st33: Replace access to io_lpcpd from struct st33zp24_platform_data to tpm_stm_dev

[Christophe Ricard]

io_lpcpd is accessible from struct tpm_stm_dev.
struct st33zp24_platform_data is only valid when using static platform
configuration data, not when using dts.

Reviewed-by: Jasob Gunthorpe <jason.guntho...@obsidianresearch.com>
Signed-off-by: Christophe Ricard <christophe-h.ric...@st.com>
---
 drivers/char/tpm/tpm_i2c_stm_st33.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.c 
b/drivers/char/tpm/tpm_i2c_stm_st33.c
index d12d507..9d3c9c8 100644
--- a/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -834,11 +834,14 @@ static int tpm_stm_i2c_remove(struct i2c_client *client)
  */
 static int tpm_stm_i2c_pm_suspend(struct device *dev)
 {
-       struct st33zp24_platform_data *pin_infos = dev->platform_data;
+       struct tpm_chip *chip = dev_get_drvdata(dev);
+       struct tpm_stm_dev *tpm_dev;
        int ret = 0;
 
-       if (gpio_is_valid(pin_infos->io_lpcpd))
-               gpio_set_value(pin_infos->io_lpcpd, 0);
+       tpm_dev = (struct tpm_stm_dev *)TPM_VPRIV(chip);
+
+       if (gpio_is_valid(tpm_dev->io_lpcpd))
+               gpio_set_value(tpm_dev->io_lpcpd, 0);
        else
                ret = tpm_pm_suspend(dev);
 
@@ -853,12 +856,13 @@ static int tpm_stm_i2c_pm_suspend(struct device *dev)
 static int tpm_stm_i2c_pm_resume(struct device *dev)
 {
        struct tpm_chip *chip = dev_get_drvdata(dev);
-       struct st33zp24_platform_data *pin_infos = dev->platform_data;
-
+       struct tpm_stm_dev *tpm_dev;
        int ret = 0;
 
+       tpm_dev = (struct tpm_stm_dev *)TPM_VPRIV(chip);
+
        if (gpio_is_valid(pin_infos->io_lpcpd)) {
-               gpio_set_value(pin_infos->io_lpcpd, 1);
+               gpio_set_value(tpm_dev->io_lpcpd, 1);
                ret = wait_for_stat(chip,
                                TPM_STS_VALID, chip->vendor.timeout_b,
                                &chip->vendor.read_queue, false);
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html