tpm: drop int_queue from tpm_vendor_specific

Drop field int_queue from tpm_vendor_specific as it is used only by
tpm_tis. Probably all of the fields should be eventually dropped and
moved to the private structures of different drivers but it is better to
do this one step at a time in order not to break anything.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 928b47f587713bfca1150d7c9ae11a6d8183139f..f5e1846f4aaae9258575d6fe925aec8dafd07fd1 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -148,7 +148,6 @@ struct tpm_vendor_specific {
        void *priv;
 
        wait_queue_head_t read_queue;
-       wait_queue_head_t int_queue;
 
        u16 manufacturer_id;
 };

diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
index d61d43feda25d40bce8e56b7524202408e43771f..a43b5f36b654a19d663f2c2d49c946be70b6aef5 100644 (file)
--- a/drivers/char/tpm/tpm_i2c_nuvoton.c
+++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
@@ -540,7 +540,6 @@ static int i2c_nuvoton_probe(struct i2c_client *client,
                return -ENOMEM;
 
        init_waitqueue_head(&chip->vendor.read_queue);
-       init_waitqueue_head(&chip->vendor.int_queue);
 
        /* Default timeouts */
        chip->vendor.timeout_a = msecs_to_jiffies(TPM_I2C_SHORT_TIMEOUT);

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 0b0d44f9aaf23b2f2b28138be72cb89c78faa6c0..9c3a52d1a7029a371029bb326922aace47bc5cd4 100644 (file)
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -95,6 +95,7 @@ struct tpm_info {
 
 struct priv_data {
        bool irq_tested;
+       wait_queue_head_t int_queue;
 };
 
 #if defined(CONFIG_PNP) && defined(CONFIG_ACPI)
@@ -157,6 +158,7 @@ static void release_locality(struct tpm_chip *chip, int l, int force)
 
 static int request_locality(struct tpm_chip *chip, int l)
 {
+       struct priv_data *priv = chip->vendor.priv;
        unsigned long stop, timeout;
        long rc;
 
@@ -173,7 +175,7 @@ again:
                timeout = stop - jiffies;
                if ((long)timeout <= 0)
                        return -1;
-               rc = wait_event_interruptible_timeout(chip->vendor.int_queue,
+               rc = wait_event_interruptible_timeout(priv->int_queue,
                                                      (check_locality
                                                       (chip, l) >= 0),
                                                      timeout);
@@ -249,6 +251,7 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
 
 static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)
 {
+       struct priv_data *priv = chip->vendor.priv;
        int size = 0;
        int expected, status;
 
@@ -279,7 +282,7 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)
        }
 
        wait_for_tpm_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c,
-                         &chip->vendor.int_queue, false);
+                         &priv->int_queue, false);
        status = tpm_tis_status(chip);
        if (status & TPM_STS_DATA_AVAIL) {      /* retry? */
                dev_err(&chip->dev, "Error left over data\n");
@@ -304,6 +307,7 @@ MODULE_PARM_DESC(itpm, "Force iTPM workarounds (found on some Lenovo laptops)");
  */
 static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
 {
+       struct priv_data *priv = chip->vendor.priv;
        int rc, status, burstcnt;
        size_t count = 0;
 
@@ -315,7 +319,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
                tpm_tis_ready(chip);
                if (wait_for_tpm_stat
                    (chip, TPM_STS_COMMAND_READY, chip->vendor.timeout_b,
-                    &chip->vendor.int_queue, false) < 0) {
+                    &priv->int_queue, false) < 0) {
                        rc = -ETIME;
                        goto out_err;
                }
@@ -330,7 +334,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
                }
 
                wait_for_tpm_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c,
-                                 &chip->vendor.int_queue, false);
+                                 &priv->int_queue, false);
                status = tpm_tis_status(chip);
                if (!itpm && (status & TPM_STS_DATA_EXPECT) == 0) {
                        rc = -EIO;
@@ -342,7 +346,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
        iowrite8(buf[count],
                 chip->vendor.iobase + TPM_DATA_FIFO(chip->vendor.locality));
        wait_for_tpm_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c,
-                         &chip->vendor.int_queue, false);
+                         &priv->int_queue, false);
        status = tpm_tis_status(chip);
        if ((status & TPM_STS_DATA_EXPECT) != 0) {
                rc = -EIO;
@@ -537,6 +541,7 @@ static const struct tpm_class_ops tpm_tis = {
 static irqreturn_t tis_int_handler(int dummy, void *dev_id)
 {
        struct tpm_chip *chip = dev_id;
+       struct priv_data *priv = chip->vendor.priv;
        u32 interrupt;
        int i;
 
@@ -556,7 +561,7 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id)
        if (interrupt &
            (TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_STS_VALID_INT |
             TPM_INTF_CMD_READY_INT))
-               wake_up_interruptible(&chip->vendor.int_queue);
+               wake_up_interruptible(&priv->int_queue);
 
        /* Clear interrupts handled with TPM_EOI */
        iowrite32(interrupt,
@@ -768,7 +773,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info,
 
        /* INTERRUPT Setup */
        init_waitqueue_head(&chip->vendor.read_queue);
-       init_waitqueue_head(&chip->vendor.int_queue);
+       init_waitqueue_head(&priv->int_queue);
        if (interrupts && tpm_info->irq != -1) {
                if (tpm_info->irq) {
                        tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,