tpm: rename chip->dev to chip->pdev

[cascardo/linux.git] / drivers / char / tpm / tpm_i2c_stm_st33.c

diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.c b/drivers/char/tpm/tpm_i2c_stm_st33.c
index 9a96d37..48c4808 100644 (file)
--- a/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -588,7 +588,7 @@ static int tpm_stm_i2c_recv(struct tpm_chip *chip, unsigned char *buf,
 
        size = recv_data(chip, buf, TPM_HEADER_SIZE);
        if (size < TPM_HEADER_SIZE) {
-               dev_err(chip->dev, "Unable to read header\n");
+               dev_err(chip->pdev, "Unable to read header\n");
                goto out;
        }
 
@@ -601,7 +601,7 @@ static int tpm_stm_i2c_recv(struct tpm_chip *chip, unsigned char *buf,
        size += recv_data(chip, &buf[TPM_HEADER_SIZE],
                        expected - TPM_HEADER_SIZE);
        if (size < expected) {
-               dev_err(chip->dev, "Unable to read remainder of result\n");
+               dev_err(chip->pdev, "Unable to read remainder of result\n");
                size = -ETIME;
                goto out;
        }
@@ -639,14 +639,14 @@ static int tpm_stm_i2c_of_request_resources(struct tpm_chip *chip)
 
        pp = client->dev.of_node;
        if (!pp) {
-               dev_err(chip->dev, "No platform data\n");
+               dev_err(chip->pdev, "No platform data\n");
                return -ENODEV;
        }
 
        /* Get GPIO from device tree */
        gpio = of_get_named_gpio(pp, "lpcpd-gpios", 0);
        if (gpio < 0) {
-               dev_err(chip->dev, "Failed to retrieve lpcpd-gpios from dts.\n");
+               dev_err(chip->pdev, "Failed to retrieve lpcpd-gpios from dts.\n");
                tpm_dev->io_lpcpd = -1;
                /*
                 * lpcpd pin is not specified. This is not an issue as
@@ -659,7 +659,7 @@ static int tpm_stm_i2c_of_request_resources(struct tpm_chip *chip)
        ret = devm_gpio_request_one(&client->dev, gpio,
                        GPIOF_OUT_INIT_HIGH, "TPM IO LPCPD");
        if (ret) {
-               dev_err(chip->dev, "Failed to request lpcpd pin\n");
+               dev_err(chip->pdev, "Failed to request lpcpd pin\n");
                return -ENODEV;
        }
        tpm_dev->io_lpcpd = gpio;
@@ -682,7 +682,7 @@ static int tpm_stm_i2c_request_resources(struct i2c_client *client,
 
        pdata = client->dev.platform_data;
        if (!pdata) {
-               dev_err(chip->dev, "No platform data\n");
+               dev_err(chip->pdev, "No platform data\n");
                return -ENODEV;
        }
 
@@ -694,7 +694,7 @@ static int tpm_stm_i2c_request_resources(struct i2c_client *client,
                                pdata->io_lpcpd, GPIOF_OUT_INIT_HIGH,
                                "TPM IO_LPCPD");
                if (ret) {
-                       dev_err(chip->dev, "%s : reset gpio_request failed\n",
+                       dev_err(chip->pdev, "%s : reset gpio_request failed\n",
                                __FILE__);
                        return ret;
                }
@@ -776,7 +776,7 @@ tpm_stm_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)
                                IRQF_TRIGGER_HIGH,
                                "TPM SERIRQ management", chip);
                if (ret < 0) {
-                       dev_err(chip->dev , "TPM SERIRQ signals %d not available\n",
+                       dev_err(chip->pdev , "TPM SERIRQ signals %d not available\n",
                                client->irq);
                        goto _tpm_clean_answer;
                }
@@ -807,7 +807,7 @@ tpm_stm_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
        return tpm_chip_register(chip);
 _tpm_clean_answer:
-       dev_info(chip->dev, "TPM I2C initialisation fail\n");
+       dev_info(chip->pdev, "TPM I2C initialisation fail\n");
        return ret;
 }