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

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

diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index dc0a255..6d49213 100644 (file)
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -195,9 +195,9 @@ static int wait(struct tpm_chip *chip, int wait_for_bit)
        }
        if (i == TPM_MAX_TRIES) {       /* timeout occurs */
                if (wait_for_bit == STAT_XFE)
-                       dev_err(chip->dev, "Timeout in wait(STAT_XFE)\n");
+                       dev_err(chip->pdev, "Timeout in wait(STAT_XFE)\n");
                if (wait_for_bit == STAT_RDA)
-                       dev_err(chip->dev, "Timeout in wait(STAT_RDA)\n");
+                       dev_err(chip->pdev, "Timeout in wait(STAT_RDA)\n");
                return -EIO;
        }
        return 0;
@@ -220,7 +220,7 @@ static void wait_and_send(struct tpm_chip *chip, u8 sendbyte)
 static void tpm_wtx(struct tpm_chip *chip)
 {
        number_of_wtx++;
-       dev_info(chip->dev, "Granting WTX (%02d / %02d)\n",
+       dev_info(chip->pdev, "Granting WTX (%02d / %02d)\n",
                 number_of_wtx, TPM_MAX_WTX_PACKAGES);
        wait_and_send(chip, TPM_VL_VER);
        wait_and_send(chip, TPM_CTRL_WTX);
@@ -231,7 +231,7 @@ static void tpm_wtx(struct tpm_chip *chip)
 
 static void tpm_wtx_abort(struct tpm_chip *chip)
 {
-       dev_info(chip->dev, "Aborting WTX\n");
+       dev_info(chip->pdev, "Aborting WTX\n");
        wait_and_send(chip, TPM_VL_VER);
        wait_and_send(chip, TPM_CTRL_WTX_ABORT);
        wait_and_send(chip, 0x00);
@@ -257,7 +257,7 @@ recv_begin:
        }
 
        if (buf[0] != TPM_VL_VER) {
-               dev_err(chip->dev,
+               dev_err(chip->pdev,
                        "Wrong transport protocol implementation!\n");
                return -EIO;
        }
@@ -272,7 +272,7 @@ recv_begin:
                }
 
                if ((size == 0x6D00) && (buf[1] == 0x80)) {
-                       dev_err(chip->dev, "Error handling on vendor layer!\n");
+                       dev_err(chip->pdev, "Error handling on vendor layer!\n");
                        return -EIO;
                }
 
@@ -284,7 +284,7 @@ recv_begin:
        }
 
        if (buf[1] == TPM_CTRL_WTX) {
-               dev_info(chip->dev, "WTX-package received\n");
+               dev_info(chip->pdev, "WTX-package received\n");
                if (number_of_wtx < TPM_MAX_WTX_PACKAGES) {
                        tpm_wtx(chip);
                        goto recv_begin;
@@ -295,14 +295,14 @@ recv_begin:
        }
 
        if (buf[1] == TPM_CTRL_WTX_ABORT_ACK) {
-               dev_info(chip->dev, "WTX-abort acknowledged\n");
+               dev_info(chip->pdev, "WTX-abort acknowledged\n");
                return size;
        }
 
        if (buf[1] == TPM_CTRL_ERROR) {
-               dev_err(chip->dev, "ERROR-package received:\n");
+               dev_err(chip->pdev, "ERROR-package received:\n");
                if (buf[4] == TPM_INF_NAK)
-                       dev_err(chip->dev,
+                       dev_err(chip->pdev,
                                "-> Negative acknowledgement"
                                " - retransmit command!\n");
                return -EIO;
@@ -321,7 +321,7 @@ static int tpm_inf_send(struct tpm_chip *chip, u8 * buf, size_t count)
 
        ret = empty_fifo(chip, 1);
        if (ret) {
-               dev_err(chip->dev, "Timeout while clearing FIFO\n");
+               dev_err(chip->pdev, "Timeout while clearing FIFO\n");
                return -EIO;
        }
 
@@ -546,7 +546,14 @@ static int tpm_inf_pnp_probe(struct pnp_dev *dev,
                         vendorid[0], vendorid[1],
                         productid[0], productid[1], chipname);
 
-               if (!(chip = tpm_register_hardware(&dev->dev, &tpm_inf)))
+               chip = tpmm_chip_alloc(&dev->dev, &tpm_inf);
+               if (IS_ERR(chip)) {
+                       rc = PTR_ERR(chip);
+                       goto err_release_region;
+               }
+
+               rc = tpm_chip_register(chip);
+               if (rc)
                        goto err_release_region;
 
                return 0;
@@ -572,17 +579,15 @@ static void tpm_inf_pnp_remove(struct pnp_dev *dev)
 {
        struct tpm_chip *chip = pnp_get_drvdata(dev);
 
-       if (chip) {
-               if (tpm_dev.iotype == TPM_INF_IO_PORT) {
-                       release_region(tpm_dev.data_regs, tpm_dev.data_size);
-                       release_region(tpm_dev.config_port,
-                                      tpm_dev.config_size);
-               } else {
-                       iounmap(tpm_dev.mem_base);
-                       release_mem_region(tpm_dev.map_base, tpm_dev.map_size);
-               }
-               tpm_dev_vendor_release(chip);
-               tpm_remove_hardware(chip->dev);
+       tpm_chip_unregister(chip);
+
+       if (tpm_dev.iotype == TPM_INF_IO_PORT) {
+               release_region(tpm_dev.data_regs, tpm_dev.data_size);
+               release_region(tpm_dev.config_port,
+                              tpm_dev.config_size);
+       } else {
+               iounmap(tpm_dev.mem_base);
+               release_mem_region(tpm_dev.map_base, tpm_dev.map_size);
        }
 }