From: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
To: Christophe Ricard
<christophe.ricard-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: jean-luc.blanc-qxv4g6HH51o@public.gmane.org,
ashley-fm2HMyfA2y6tG0bUXCXiUA@public.gmane.org,
tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
christophe-h.ricard-qxv4g6HH51o@public.gmane.org,
benoit.houyere-qxv4g6HH51o@public.gmane.org
Subject: Re: [PATCH v2 2/7] tpm: Remove useless priv field in struct tpm_vendor_specific
Date: Tue, 29 Mar 2016 17:19:33 +0300 [thread overview]
Message-ID: <20160329141933.GD12764@intel.com> (raw)
In-Reply-To: <1458975615-8095-3-git-send-email-christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
On Sat, Mar 26, 2016 at 08:00:10AM +0100, Christophe Ricard wrote:
> Remove useless priv field in struct tpm_vendor_specific and take benefit
> of chip->dev.driver_data.
NAK. The order should be take all the fields from vendor specific and
then as a final step remove it when there is only the field 'priv'.
/Jarkko
> Signed-off-by: Christophe Ricard <christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
> ---
> drivers/char/tpm/st33zp24/i2c.c | 15 ++++++----
> drivers/char/tpm/st33zp24/spi.c | 15 ++++++----
> drivers/char/tpm/st33zp24/st33zp24.c | 58 +++++++++---------------------------
> drivers/char/tpm/st33zp24/st33zp24.h | 7 +++++
> drivers/char/tpm/tpm.h | 3 --
> drivers/char/tpm/tpm_atmel.c | 12 ++++----
> drivers/char/tpm/tpm_atmel.h | 5 ----
> drivers/char/tpm/tpm_crb.c | 12 ++++----
> drivers/char/tpm/tpm_i2c_atmel.c | 14 +++++----
> drivers/char/tpm/tpm_i2c_nuvoton.c | 16 +++++-----
> drivers/char/tpm/tpm_ibmvtpm.c | 38 +++++++----------------
> drivers/char/tpm/tpm_nsc.c | 48 +++++++++++++++--------------
> drivers/char/tpm/tpm_tis.c | 48 +++++++++++++++--------------
> drivers/char/tpm/xen-tpmfront.c | 14 ++++-----
> 14 files changed, 139 insertions(+), 166 deletions(-)
>
> diff --git a/drivers/char/tpm/st33zp24/i2c.c b/drivers/char/tpm/st33zp24/i2c.c
> index f8e8123..028a9cd 100644
> --- a/drivers/char/tpm/st33zp24/i2c.c
> +++ b/drivers/char/tpm/st33zp24/i2c.c
> @@ -26,6 +26,7 @@
> #include <linux/tpm.h>
> #include <linux/platform_data/st33zp24.h>
>
> +#include "../tpm.h"
> #include "st33zp24.h"
>
> #define TPM_DUMMY_BYTE 0xAA
> @@ -112,7 +113,9 @@ static const struct st33zp24_phy_ops i2c_phy_ops = {
>
> static int st33zp24_i2c_acpi_request_resources(struct i2c_client *client)
> {
> - struct st33zp24_i2c_phy *phy = i2c_get_clientdata(client);
> + struct tpm_chip *chip = i2c_get_clientdata(client);
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> + struct st33zp24_i2c_phy *phy = tpm_dev->phy_id;
> struct gpio_desc *gpiod_lpcpd;
> struct device *dev = &client->dev;
>
> @@ -138,7 +141,9 @@ static int st33zp24_i2c_acpi_request_resources(struct i2c_client *client)
>
> static int st33zp24_i2c_of_request_resources(struct i2c_client *client)
> {
> - struct st33zp24_i2c_phy *phy = i2c_get_clientdata(client);
> + struct tpm_chip *chip = i2c_get_clientdata(client);
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> + struct st33zp24_i2c_phy *phy = tpm_dev->phy_id;
> struct device_node *pp;
> int gpio;
> int ret;
> @@ -176,8 +181,10 @@ static int st33zp24_i2c_of_request_resources(struct i2c_client *client)
>
> static int st33zp24_i2c_request_resources(struct i2c_client *client)
> {
> + struct tpm_chip *chip = i2c_get_clientdata(client);
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> + struct st33zp24_i2c_phy *phy = tpm_dev->phy_id;
> struct st33zp24_platform_data *pdata;
> - struct st33zp24_i2c_phy *phy = i2c_get_clientdata(client);
> int ret;
>
> pdata = client->dev.platform_data;
> @@ -234,8 +241,6 @@ static int st33zp24_i2c_probe(struct i2c_client *client,
>
> phy->client = client;
>
> - i2c_set_clientdata(client, phy);
> -
> pdata = client->dev.platform_data;
> if (!pdata && client->dev.of_node) {
> ret = st33zp24_i2c_of_request_resources(client);
> diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c
> index 608dbc6..9f5a011 100644
> --- a/drivers/char/tpm/st33zp24/spi.c
> +++ b/drivers/char/tpm/st33zp24/spi.c
> @@ -26,6 +26,7 @@
> #include <linux/tpm.h>
> #include <linux/platform_data/st33zp24.h>
>
> +#include "../tpm.h"
> #include "st33zp24.h"
>
> #define TPM_DATA_FIFO 0x24
> @@ -231,7 +232,9 @@ static const struct st33zp24_phy_ops spi_phy_ops = {
>
> static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev)
> {
> - struct st33zp24_spi_phy *phy = spi_get_drvdata(spi_dev);
> + struct tpm_chip *chip = spi_get_drvdata(spi_dev);
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> + struct st33zp24_spi_phy *phy = tpm_dev->phy_id;
> struct gpio_desc *gpiod_lpcpd;
> struct device *dev = &spi_dev->dev;
>
> @@ -256,7 +259,9 @@ static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev)
>
> static int st33zp24_spi_of_request_resources(struct spi_device *spi_dev)
> {
> - struct st33zp24_spi_phy *phy = spi_get_drvdata(spi_dev);
> + struct tpm_chip *chip = spi_get_drvdata(spi_dev);
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> + struct st33zp24_spi_phy *phy = tpm_dev->phy_id;
> struct device_node *pp;
> int gpio;
> int ret;
> @@ -294,7 +299,9 @@ static int st33zp24_spi_of_request_resources(struct spi_device *spi_dev)
>
> static int st33zp24_spi_request_resources(struct spi_device *dev)
> {
> - struct st33zp24_spi_phy *phy = spi_get_drvdata(dev);
> + struct tpm_chip *chip = spi_get_drvdata(dev);
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> + struct st33zp24_spi_phy *phy = tpm_dev->phy_id;
> struct st33zp24_platform_data *pdata;
> int ret;
>
> @@ -347,8 +354,6 @@ static int st33zp24_spi_probe(struct spi_device *dev)
>
> phy->spi_device = dev;
>
> - spi_set_drvdata(dev, phy);
> -
> pdata = dev->dev.platform_data;
> if (!pdata && dev->dev.of_node) {
> ret = st33zp24_spi_of_request_resources(dev);
> diff --git a/drivers/char/tpm/st33zp24/st33zp24.c b/drivers/char/tpm/st33zp24/st33zp24.c
> index 9e91ca7..3c0625c 100644
> --- a/drivers/char/tpm/st33zp24/st33zp24.c
> +++ b/drivers/char/tpm/st33zp24/st33zp24.c
> @@ -73,14 +73,6 @@ enum tis_defaults {
> TIS_LONG_TIMEOUT = 2000,
> };
>
> -struct st33zp24_dev {
> - struct tpm_chip *chip;
> - void *phy_id;
> - const struct st33zp24_phy_ops *ops;
> - u32 intrs;
> - int io_lpcpd;
> -};
> -
> /*
> * clear_interruption clear the pending interrupt.
> * @param: tpm_dev, the tpm device device.
> @@ -102,11 +94,9 @@ static u8 clear_interruption(struct st33zp24_dev *tpm_dev)
> */
> static void st33zp24_cancel(struct tpm_chip *chip)
> {
> - struct st33zp24_dev *tpm_dev;
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> u8 data;
>
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
> -
> data = TPM_STS_COMMAND_READY;
> tpm_dev->ops->send(tpm_dev->phy_id, TPM_STS, &data, 1);
> } /* st33zp24_cancel() */
> @@ -118,10 +108,9 @@ static void st33zp24_cancel(struct tpm_chip *chip)
> */
> static u8 st33zp24_status(struct tpm_chip *chip)
> {
> - struct st33zp24_dev *tpm_dev;
> - u8 data;
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
>
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
> + u8 data;
>
> tpm_dev->ops->recv(tpm_dev->phy_id, TPM_STS, &data, 1);
> return data;
> @@ -134,12 +123,10 @@ static u8 st33zp24_status(struct tpm_chip *chip)
> */
> static int check_locality(struct tpm_chip *chip)
> {
> - struct st33zp24_dev *tpm_dev;
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> u8 data;
> u8 status;
>
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
> -
> status = tpm_dev->ops->recv(tpm_dev->phy_id, TPM_ACCESS, &data, 1);
> if (status && (data &
> (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) ==
> @@ -158,14 +145,12 @@ static int request_locality(struct tpm_chip *chip)
> {
> unsigned long stop;
> long ret;
> - struct st33zp24_dev *tpm_dev;
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> u8 data;
>
> if (check_locality(chip) == chip->vendor.locality)
> return chip->vendor.locality;
>
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
> -
> data = TPM_ACCESS_REQUEST_USE;
> ret = tpm_dev->ops->send(tpm_dev->phy_id, TPM_ACCESS, &data, 1);
> if (ret < 0)
> @@ -190,10 +175,9 @@ static int request_locality(struct tpm_chip *chip)
> */
> static void release_locality(struct tpm_chip *chip)
> {
> - struct st33zp24_dev *tpm_dev;
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> u8 data;
>
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
> data = TPM_ACCESS_ACTIVE_LOCALITY;
>
> tpm_dev->ops->send(tpm_dev->phy_id, TPM_ACCESS, &data, 1);
> @@ -206,12 +190,10 @@ static void release_locality(struct tpm_chip *chip)
> */
> static int get_burstcount(struct tpm_chip *chip)
> {
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> unsigned long stop;
> int burstcnt, status;
> u8 temp;
> - struct st33zp24_dev *tpm_dev;
> -
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
>
> stop = jiffies + chip->vendor.timeout_d;
> do {
> @@ -271,15 +253,13 @@ static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask,
> static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
> wait_queue_head_t *queue, bool check_cancel)
> {
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> unsigned long stop;
> int ret = 0;
> bool canceled = false;
> bool condition;
> u32 cur_intrs;
> u8 status;
> - struct st33zp24_dev *tpm_dev;
> -
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
>
> /* check current status */
> status = st33zp24_status(chip);
> @@ -337,10 +317,8 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
> */
> static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
> {
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> int size = 0, burstcnt, len, ret;
> - struct st33zp24_dev *tpm_dev;
> -
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
>
> while (size < count &&
> wait_for_stat(chip,
> @@ -370,9 +348,7 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
> static irqreturn_t tpm_ioserirq_handler(int irq, void *dev_id)
> {
> struct tpm_chip *chip = dev_id;
> - struct st33zp24_dev *tpm_dev;
> -
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
>
> tpm_dev->intrs++;
> wake_up_interruptible(&chip->vendor.read_queue);
> @@ -393,19 +369,17 @@ static irqreturn_t tpm_ioserirq_handler(int irq, void *dev_id)
> static int st33zp24_send(struct tpm_chip *chip, unsigned char *buf,
> size_t len)
> {
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> u32 status, i, size, ordinal;
> int burstcnt = 0;
> int ret;
> u8 data;
> - struct st33zp24_dev *tpm_dev;
>
> if (!chip)
> return -EBUSY;
> if (len < TPM_HEADER_SIZE)
> return -EBUSY;
>
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
> -
> ret = request_locality(chip);
> if (ret < 0)
> return ret;
> @@ -565,9 +539,9 @@ int st33zp24_probe(void *phy_id, const struct st33zp24_phy_ops *ops,
> if (!tpm_dev)
> return -ENOMEM;
>
> - TPM_VPRIV(chip) = tpm_dev;
> tpm_dev->phy_id = phy_id;
> tpm_dev->ops = ops;
> + dev_set_drvdata(&chip->dev, tpm_dev);
>
> chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT);
> chip->vendor.timeout_b = msecs_to_jiffies(TIS_LONG_TIMEOUT);
> @@ -650,11 +624,9 @@ EXPORT_SYMBOL(st33zp24_remove);
> int st33zp24_pm_suspend(struct device *dev)
> {
> struct tpm_chip *chip = dev_get_drvdata(dev);
> - struct st33zp24_dev *tpm_dev;
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> int ret = 0;
>
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
> -
> if (gpio_is_valid(tpm_dev->io_lpcpd))
> gpio_set_value(tpm_dev->io_lpcpd, 0);
> else
> @@ -672,11 +644,9 @@ EXPORT_SYMBOL(st33zp24_pm_suspend);
> int st33zp24_pm_resume(struct device *dev)
> {
> struct tpm_chip *chip = dev_get_drvdata(dev);
> - struct st33zp24_dev *tpm_dev;
> + struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
> int ret = 0;
>
> - tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);
> -
> if (gpio_is_valid(tpm_dev->io_lpcpd)) {
> gpio_set_value(tpm_dev->io_lpcpd, 1);
> ret = wait_for_stat(chip,
> diff --git a/drivers/char/tpm/st33zp24/st33zp24.h b/drivers/char/tpm/st33zp24/st33zp24.h
> index bcbd5ff..b242263 100644
> --- a/drivers/char/tpm/st33zp24/st33zp24.h
> +++ b/drivers/char/tpm/st33zp24/st33zp24.h
> @@ -21,6 +21,13 @@
> #define TPM_WRITE_DIRECTION 0x80
> #define TPM_BUFSIZE 2048
>
> +struct st33zp24_dev {
> + void *phy_id;
> + const struct st33zp24_phy_ops *ops;
> + u32 intrs;
> + int io_lpcpd;
> +};
> +
> struct st33zp24_phy_ops {
> int (*send)(void *phy_id, u8 tpm_register, u8 *tpm_data, int tpm_size);
> int (*recv)(void *phy_id, u8 tpm_register, u8 *tpm_data, int tpm_size);
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index 357ac14..c4d3f41 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -138,13 +138,10 @@ struct tpm_vendor_specific {
> bool timeout_adjusted;
> unsigned long duration[3]; /* jiffies */
> bool duration_adjusted;
> - void *priv;
>
> wait_queue_head_t read_queue;
> };
>
> -#define TPM_VPRIV(c) ((c)->vendor.priv)
> -
> #define TPM_VID_INTEL 0x8086
> #define TPM_VID_WINBOND 0x1050
> #define TPM_VID_STM 0x104A
> diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
> index b769299..0d322ab 100644
> --- a/drivers/char/tpm/tpm_atmel.c
> +++ b/drivers/char/tpm/tpm_atmel.c
> @@ -37,7 +37,7 @@ enum tpm_atmel_read_status {
>
> static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count)
> {
> - struct tpm_atmel_priv *priv = chip->vendor.priv;
> + struct tpm_atmel_priv *priv = dev_get_drvdata(&chip->dev);
> u8 status, *hdr = buf;
> u32 size;
> int i;
> @@ -96,7 +96,7 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count)
>
> static int tpm_atml_send(struct tpm_chip *chip, u8 *buf, size_t count)
> {
> - struct tpm_atmel_priv *priv = chip->vendor.priv;
> + struct tpm_atmel_priv *priv = dev_get_drvdata(&chip->dev);
> int i;
>
> dev_dbg(&chip->dev, "tpm_atml_send:\n");
> @@ -110,14 +110,14 @@ static int tpm_atml_send(struct tpm_chip *chip, u8 *buf, size_t count)
>
> static void tpm_atml_cancel(struct tpm_chip *chip)
> {
> - struct tpm_atmel_priv *priv = chip->vendor.priv;
> + struct tpm_atmel_priv *priv = dev_get_drvdata(&chip->dev);
>
> iowrite8(ATML_STATUS_ABORT, priv->iobase + 1);
> }
>
> static u8 tpm_atml_status(struct tpm_chip *chip)
> {
> - struct tpm_atmel_priv *priv = chip->vendor.priv;
> + struct tpm_atmel_priv *priv = dev_get_drvdata(&chip->dev);
>
> return ioread8(priv->iobase + 1);
> }
> @@ -142,7 +142,7 @@ static struct platform_device *pdev;
> static void atml_plat_remove(void)
> {
> struct tpm_chip *chip = dev_get_drvdata(&pdev->dev);
> - struct tpm_atmel_priv *priv = chip->vendor.priv;
> + struct tpm_atmel_priv *priv = dev_get_drvdata(&chip->dev);
>
> if (chip) {
> tpm_chip_unregister(chip);
> @@ -207,7 +207,7 @@ static int __init init_atmel(void)
> goto err_unreg_dev;
> }
>
> - chip->vendor.priv = priv;
> + dev_set_drvdata(&chip->dev, priv);
>
> rc = tpm_chip_register(chip);
> if (rc)
> diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h
> index 7e37c16..c786e01 100644
> --- a/drivers/char/tpm/tpm_atmel.h
> +++ b/drivers/char/tpm/tpm_atmel.h
> @@ -29,11 +29,6 @@ struct tpm_atmel_priv {
> void __iomem *iobase;
> };
>
> -static inline struct tpm_atmel_priv *atmel_get_priv(struct tpm_chip *chip)
> -{
> - return chip->vendor.priv;
> -}
> -
> #ifdef CONFIG_PPC64
>
> #include <asm/prom.h>
> diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
> index 8767da6..20155d5 100644
> --- a/drivers/char/tpm/tpm_crb.c
> +++ b/drivers/char/tpm/tpm_crb.c
> @@ -87,7 +87,7 @@ static SIMPLE_DEV_PM_OPS(crb_pm, tpm_pm_suspend, tpm_pm_resume);
>
> static u8 crb_status(struct tpm_chip *chip)
> {
> - struct crb_priv *priv = chip->vendor.priv;
> + struct crb_priv *priv = dev_get_drvdata(&chip->dev);
> u8 sts = 0;
>
> if ((ioread32(&priv->cca->start) & CRB_START_INVOKE) !=
> @@ -99,7 +99,7 @@ static u8 crb_status(struct tpm_chip *chip)
>
> static int crb_recv(struct tpm_chip *chip, u8 *buf, size_t count)
> {
> - struct crb_priv *priv = chip->vendor.priv;
> + struct crb_priv *priv = dev_get_drvdata(&chip->dev);
> unsigned int expected;
>
> /* sanity check */
> @@ -139,7 +139,7 @@ static int crb_do_acpi_start(struct tpm_chip *chip)
>
> static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)
> {
> - struct crb_priv *priv = chip->vendor.priv;
> + struct crb_priv *priv = dev_get_drvdata(&chip->dev);
> int rc = 0;
>
> if (len > ioread32(&priv->cca->cmd_size)) {
> @@ -163,7 +163,7 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)
>
> static void crb_cancel(struct tpm_chip *chip)
> {
> - struct crb_priv *priv = chip->vendor.priv;
> + struct crb_priv *priv = dev_get_drvdata(&chip->dev);
>
> iowrite32(cpu_to_le32(CRB_CANCEL_INVOKE), &priv->cca->cancel);
>
> @@ -175,7 +175,7 @@ static void crb_cancel(struct tpm_chip *chip)
>
> static bool crb_req_canceled(struct tpm_chip *chip, u8 status)
> {
> - struct crb_priv *priv = chip->vendor.priv;
> + struct crb_priv *priv = dev_get_drvdata(&chip->dev);
> u32 cancel = ioread32(&priv->cca->cancel);
>
> return (cancel & CRB_CANCEL_INVOKE) == CRB_CANCEL_INVOKE;
> @@ -200,7 +200,7 @@ static int crb_init(struct acpi_device *device, struct crb_priv *priv)
> if (IS_ERR(chip))
> return PTR_ERR(chip);
>
> - chip->vendor.priv = priv;
> + dev_set_drvdata(&chip->dev, priv);
> chip->acpi_dev_handle = device->handle;
> chip->flags = TPM_CHIP_FLAG_TPM2;
>
> diff --git a/drivers/char/tpm/tpm_i2c_atmel.c b/drivers/char/tpm/tpm_i2c_atmel.c
> index dd8f0eb..f311aaf 100644
> --- a/drivers/char/tpm/tpm_i2c_atmel.c
> +++ b/drivers/char/tpm/tpm_i2c_atmel.c
> @@ -51,7 +51,7 @@ struct priv_data {
>
> static int i2c_atmel_send(struct tpm_chip *chip, u8 *buf, size_t len)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> struct i2c_client *client = to_i2c_client(chip->dev.parent);
> s32 status;
>
> @@ -70,7 +70,7 @@ static int i2c_atmel_send(struct tpm_chip *chip, u8 *buf, size_t len)
>
> static int i2c_atmel_recv(struct tpm_chip *chip, u8 *buf, size_t count)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> struct i2c_client *client = to_i2c_client(chip->dev.parent);
> struct tpm_output_header *hdr =
> (struct tpm_output_header *)priv->buffer;
> @@ -111,7 +111,7 @@ static void i2c_atmel_cancel(struct tpm_chip *chip)
>
> static u8 i2c_atmel_read_status(struct tpm_chip *chip)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> struct i2c_client *client = to_i2c_client(chip->dev.parent);
> int rc;
>
> @@ -155,6 +155,7 @@ static int i2c_atmel_probe(struct i2c_client *client,
> {
> struct tpm_chip *chip;
> struct device *dev = &client->dev;
> + struct priv_data *priv;
>
> if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
> return -ENODEV;
> @@ -163,9 +164,8 @@ static int i2c_atmel_probe(struct i2c_client *client,
> if (IS_ERR(chip))
> return PTR_ERR(chip);
>
> - chip->vendor.priv = devm_kzalloc(dev, sizeof(struct priv_data),
> - GFP_KERNEL);
> - if (!chip->vendor.priv)
> + priv = devm_kzalloc(dev, sizeof(struct priv_data), GFP_KERNEL);
> + if (!priv)
> return -ENOMEM;
>
> /* Default timeouts */
> @@ -175,6 +175,8 @@ static int i2c_atmel_probe(struct i2c_client *client,
> chip->vendor.timeout_d = msecs_to_jiffies(TPM_I2C_SHORT_TIMEOUT);
> chip->vendor.irq = 0;
>
> + dev_set_drvdata(&chip->dev, priv);
> +
> /* There is no known way to probe for this device, and all version
> * information seems to be read via TPM commands. Thus we rely on the
> * TPM startup process in the common code to detect the device. */
> diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
> index a43b5f3..76ac21d 100644
> --- a/drivers/char/tpm/tpm_i2c_nuvoton.c
> +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
> @@ -178,7 +178,7 @@ static int i2c_nuvoton_wait_for_stat(struct tpm_chip *chip, u8 mask, u8 value,
> {
> if (chip->vendor.irq && queue) {
> s32 rc;
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> unsigned int cur_intrs = priv->intrs;
>
> enable_irq(chip->vendor.irq);
> @@ -473,7 +473,7 @@ static const struct tpm_class_ops tpm_i2c = {
> static irqreturn_t i2c_nuvoton_int_handler(int dummy, void *dev_id)
> {
> struct tpm_chip *chip = dev_id;
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
>
> priv->intrs++;
> wake_up(&chip->vendor.read_queue);
> @@ -520,6 +520,7 @@ static int i2c_nuvoton_probe(struct i2c_client *client,
> {
> int rc;
> struct tpm_chip *chip;
> + struct priv_data *priv;
> struct device *dev = &client->dev;
> u32 vid = 0;
>
> @@ -534,9 +535,8 @@ static int i2c_nuvoton_probe(struct i2c_client *client,
> if (IS_ERR(chip))
> return PTR_ERR(chip);
>
> - chip->vendor.priv = devm_kzalloc(dev, sizeof(struct priv_data),
> - GFP_KERNEL);
> - if (!chip->vendor.priv)
> + priv = devm_kzalloc(dev, sizeof(struct priv_data), GFP_KERNEL);
> + if (!priv)
> return -ENOMEM;
>
> init_waitqueue_head(&chip->vendor.read_queue);
> @@ -547,6 +547,8 @@ static int i2c_nuvoton_probe(struct i2c_client *client,
> chip->vendor.timeout_c = msecs_to_jiffies(TPM_I2C_SHORT_TIMEOUT);
> chip->vendor.timeout_d = msecs_to_jiffies(TPM_I2C_SHORT_TIMEOUT);
>
> + dev_set_drvdata(&chip->dev, priv);
> +
> /*
> * I2C intfcaps (interrupt capabilitieis) in the chip are hard coded to:
> * TPM_INTF_INT_LEVEL_LOW | TPM_INTF_DATA_AVAIL_INT
> @@ -611,8 +613,8 @@ static int i2c_nuvoton_probe(struct i2c_client *client,
>
> static int i2c_nuvoton_remove(struct i2c_client *client)
> {
> - struct device *dev = &(client->dev);
> - struct tpm_chip *chip = dev_get_drvdata(dev);
> + struct tpm_chip *chip = i2c_get_clientdata(client);
> +
> tpm_chip_unregister(chip);
> return 0;
> }
> diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
> index b0a9a9e..6b22826 100644
> --- a/drivers/char/tpm/tpm_ibmvtpm.c
> +++ b/drivers/char/tpm/tpm_ibmvtpm.c
> @@ -54,21 +54,6 @@ static int ibmvtpm_send_crq(struct vio_dev *vdev, u64 w1, u64 w2)
> }
>
> /**
> - * ibmvtpm_get_data - Retrieve ibm vtpm data
> - * @dev: device struct
> - *
> - * Return value:
> - * vtpm device struct
> - */
> -static struct ibmvtpm_dev *ibmvtpm_get_data(const struct device *dev)
> -{
> - struct tpm_chip *chip = dev_get_drvdata(dev);
> - if (chip)
> - return (struct ibmvtpm_dev *)TPM_VPRIV(chip);
> - return NULL;
> -}
> -
> -/**
> * tpm_ibmvtpm_recv - Receive data after send
> * @chip: tpm chip struct
> * @buf: buffer to read
> @@ -79,12 +64,10 @@ static struct ibmvtpm_dev *ibmvtpm_get_data(const struct device *dev)
> */
> static int tpm_ibmvtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count)
> {
> - struct ibmvtpm_dev *ibmvtpm;
> + struct ibmvtpm_dev *ibmvtpm = dev_get_drvdata(&chip->dev);
> u16 len;
> int sig;
>
> - ibmvtpm = (struct ibmvtpm_dev *)TPM_VPRIV(chip);
> -
> if (!ibmvtpm->rtce_buf) {
> dev_err(ibmvtpm->dev, "ibmvtpm device is not ready\n");
> return 0;
> @@ -122,13 +105,11 @@ static int tpm_ibmvtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count)
> */
> static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf, size_t count)
> {
> - struct ibmvtpm_dev *ibmvtpm;
> + struct ibmvtpm_dev *ibmvtpm = dev_get_drvdata(&chip->dev);
> struct ibmvtpm_crq crq;
> __be64 *word = (__be64 *)&crq;
> int rc, sig;
>
> - ibmvtpm = (struct ibmvtpm_dev *)TPM_VPRIV(chip);
> -
> if (!ibmvtpm->rtce_buf) {
> dev_err(ibmvtpm->dev, "ibmvtpm device is not ready\n");
> return 0;
> @@ -289,8 +270,8 @@ static int ibmvtpm_crq_send_init(struct ibmvtpm_dev *ibmvtpm)
> */
> static int tpm_ibmvtpm_remove(struct vio_dev *vdev)
> {
> - struct ibmvtpm_dev *ibmvtpm = ibmvtpm_get_data(&vdev->dev);
> - struct tpm_chip *chip = dev_get_drvdata(ibmvtpm->dev);
> + struct tpm_chip *chip = dev_get_drvdata(&vdev->dev);
> + struct ibmvtpm_dev *ibmvtpm = dev_get_drvdata(&chip->dev);
> int rc = 0;
>
> tpm_chip_unregister(chip);
> @@ -327,7 +308,8 @@ static int tpm_ibmvtpm_remove(struct vio_dev *vdev)
> */
> static unsigned long tpm_ibmvtpm_get_desired_dma(struct vio_dev *vdev)
> {
> - struct ibmvtpm_dev *ibmvtpm = ibmvtpm_get_data(&vdev->dev);
> + struct tpm_chip *chip = dev_get_drvdata(&vdev->dev);
> + struct ibmvtpm_dev *ibmvtpm = dev_get_drvdata(&chip->dev);
>
> /* ibmvtpm initializes at probe time, so the data we are
> * asking for may not be set yet. Estimate that 4K required
> @@ -348,7 +330,8 @@ static unsigned long tpm_ibmvtpm_get_desired_dma(struct vio_dev *vdev)
> */
> static int tpm_ibmvtpm_suspend(struct device *dev)
> {
> - struct ibmvtpm_dev *ibmvtpm = ibmvtpm_get_data(dev);
> + struct tpm_chip *chip = dev_get_drvdata(dev);
> + struct ibmvtpm_dev *ibmvtpm = dev_get_drvdata(&chip->dev);
> struct ibmvtpm_crq crq;
> u64 *buf = (u64 *) &crq;
> int rc = 0;
> @@ -400,7 +383,8 @@ static int ibmvtpm_reset_crq(struct ibmvtpm_dev *ibmvtpm)
> */
> static int tpm_ibmvtpm_resume(struct device *dev)
> {
> - struct ibmvtpm_dev *ibmvtpm = ibmvtpm_get_data(dev);
> + struct tpm_chip *chip = dev_get_drvdata(dev);
> + struct ibmvtpm_dev *ibmvtpm = dev_get_drvdata(&chip->dev);
> int rc = 0;
>
> do {
> @@ -643,7 +627,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
>
> crq_q->index = 0;
>
> - TPM_VPRIV(chip) = (void *)ibmvtpm;
> + dev_set_drvdata(&chip->dev, ibmvtpm)
>
> spin_lock_init(&ibmvtpm->rtce_lock);
>
> diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
> index 07163a4..9ff0e07 100644
> --- a/drivers/char/tpm/tpm_nsc.c
> +++ b/drivers/char/tpm/tpm_nsc.c
> @@ -69,20 +69,16 @@ struct tpm_nsc_priv {
> unsigned long base;
> };
>
> -static inline struct tpm_nsc_priv *nsc_get_priv(struct tpm_chip *chip)
> -{
> - return chip->vendor.priv;
> -}
> -
> /*
> * Wait for a certain status to appear
> */
> static int wait_for_stat(struct tpm_chip *chip, u8 mask, u8 val, u8 * data)
> {
> + struct tpm_nsc_priv *priv = dev_get_drvdata(&chip->dev);
> unsigned long stop;
>
> /* status immediately available check */
> - *data = inb(nsc_get_priv(chip)->base + NSC_STATUS);
> + *data = inb(priv->base + NSC_STATUS);
> if ((*data & mask) == val)
> return 0;
>
> @@ -90,7 +86,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, u8 val, u8 * data)
> stop = jiffies + 10 * HZ;
> do {
> msleep(TPM_TIMEOUT);
> - *data = inb(nsc_get_priv(chip)->base + 1);
> + *data = inb(priv->base + 1);
> if ((*data & mask) == val)
> return 0;
> }
> @@ -101,13 +97,14 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, u8 val, u8 * data)
>
> static int nsc_wait_for_ready(struct tpm_chip *chip)
> {
> + struct tpm_nsc_priv *priv = dev_get_drvdata(&chip->dev);
> int status;
> unsigned long stop;
>
> /* status immediately available check */
> - status = inb(nsc_get_priv(chip)->base + NSC_STATUS);
> + status = inb(priv->base + NSC_STATUS);
> if (status & NSC_STATUS_OBF)
> - status = inb(nsc_get_priv(chip)->base + NSC_DATA);
> + status = inb(priv->base + NSC_DATA);
> if (status & NSC_STATUS_RDY)
> return 0;
>
> @@ -115,9 +112,9 @@ static int nsc_wait_for_ready(struct tpm_chip *chip)
> stop = jiffies + 100;
> do {
> msleep(TPM_TIMEOUT);
> - status = inb(nsc_get_priv(chip)->base + NSC_STATUS);
> + status = inb(priv->base + NSC_STATUS);
> if (status & NSC_STATUS_OBF)
> - status = inb(nsc_get_priv(chip)->base + NSC_DATA);
> + status = inb(priv->base + NSC_DATA);
> if (status & NSC_STATUS_RDY)
> return 0;
> }
> @@ -130,6 +127,7 @@ static int nsc_wait_for_ready(struct tpm_chip *chip)
>
> static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
> {
> + struct tpm_nsc_priv *priv = dev_get_drvdata(&chip->dev);
> u8 *buffer = buf;
> u8 data, *p;
> u32 size;
> @@ -143,7 +141,7 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
> return -EIO;
> }
>
> - data = inb(nsc_get_priv(chip)->base + NSC_DATA);
> + data = inb(priv->base + NSC_DATA);
> if (data != NSC_COMMAND_NORMAL) {
> dev_err(&chip->dev, "not in normal mode (0x%x)\n",
> data);
> @@ -160,7 +158,7 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
> }
> if (data & NSC_STATUS_F0)
> break;
> - *p = inb(nsc_get_priv(chip)->base + NSC_DATA);
> + *p = inb(priv->base + NSC_DATA);
> }
>
> if ((data & NSC_STATUS_F0) == 0 &&
> @@ -169,7 +167,7 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
> return -EIO;
> }
>
> - data = inb(nsc_get_priv(chip)->base + NSC_DATA);
> + data = inb(priv->base + NSC_DATA);
> if (data != NSC_COMMAND_EOC) {
> dev_err(&chip->dev,
> "expected end of command(0x%x)\n", data);
> @@ -187,6 +185,7 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
>
> static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count)
> {
> + struct tpm_nsc_priv *priv = dev_get_drvdata(&chip->dev);
> u8 data;
> int i;
>
> @@ -196,7 +195,7 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count)
> * fix it. Not sure why this is needed, we followed the flow
> * chart in the manual to the letter.
> */
> - outb(NSC_COMMAND_CANCEL, nsc_get_priv(chip)->base + NSC_COMMAND);
> + outb(NSC_COMMAND_CANCEL, priv->base + NSC_COMMAND);
>
> if (nsc_wait_for_ready(chip) != 0)
> return -EIO;
> @@ -206,7 +205,7 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count)
> return -EIO;
> }
>
> - outb(NSC_COMMAND_NORMAL, nsc_get_priv(chip)->base + NSC_COMMAND);
> + outb(NSC_COMMAND_NORMAL, priv->base + NSC_COMMAND);
> if (wait_for_stat(chip, NSC_STATUS_IBR, NSC_STATUS_IBR, &data) < 0) {
> dev_err(&chip->dev, "IBR timeout\n");
> return -EIO;
> @@ -218,26 +217,30 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count)
> "IBF timeout (while writing data)\n");
> return -EIO;
> }
> - outb(buf[i], nsc_get_priv(chip)->base + NSC_DATA);
> + outb(buf[i], priv->base + NSC_DATA);
> }
>
> if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) {
> dev_err(&chip->dev, "IBF timeout\n");
> return -EIO;
> }
> - outb(NSC_COMMAND_EOC, nsc_get_priv(chip)->base + NSC_COMMAND);
> + outb(NSC_COMMAND_EOC, priv->base + NSC_COMMAND);
>
> return count;
> }
>
> static void tpm_nsc_cancel(struct tpm_chip *chip)
> {
> - outb(NSC_COMMAND_CANCEL, nsc_get_priv(chip)->base + NSC_COMMAND);
> + struct tpm_nsc_priv *priv = dev_get_drvdata(&chip->dev);
> +
> + outb(NSC_COMMAND_CANCEL, priv->base + NSC_COMMAND);
> }
>
> static u8 tpm_nsc_status(struct tpm_chip *chip)
> {
> - return inb(nsc_get_priv(chip)->base + NSC_STATUS);
> + struct tpm_nsc_priv *priv = dev_get_drvdata(&chip->dev);
> +
> + return inb(priv->base + NSC_STATUS);
> }
>
> static bool tpm_nsc_req_canceled(struct tpm_chip *chip, u8 status)
> @@ -260,9 +263,10 @@ static struct platform_device *pdev = NULL;
> static void tpm_nsc_remove(struct device *dev)
> {
> struct tpm_chip *chip = dev_get_drvdata(dev);
> + struct tpm_nsc_priv *priv = dev_get_drvdata(&chip->dev);
>
> tpm_chip_unregister(chip);
> - release_region(nsc_get_priv(chip)->base, 2);
> + release_region(priv->base, 2);
> }
>
> static SIMPLE_DEV_PM_OPS(tpm_nsc_pm, tpm_pm_suspend, tpm_pm_resume);
> @@ -334,7 +338,7 @@ static int __init init_nsc(void)
> goto err_rel_reg;
> }
>
> - chip->vendor.priv = priv;
> + dev_set_drvdata(&chip->dev, priv);
>
> rc = tpm_chip_register(chip);
> if (rc)
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index 19dac62..bf333cf 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -129,8 +129,9 @@ static inline int is_itpm(struct acpi_device *dev)
> * correct values in the other bits.' */
> static int wait_startup(struct tpm_chip *chip, int l)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> unsigned long stop = jiffies + chip->vendor.timeout_a;
> +
> do {
> if (ioread8(priv->iobase + TPM_ACCESS(l)) &
> TPM_ACCESS_VALID)
> @@ -142,7 +143,7 @@ static int wait_startup(struct tpm_chip *chip, int l)
>
> static int check_locality(struct tpm_chip *chip, int l)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
>
> if ((ioread8(priv->iobase + TPM_ACCESS(l)) &
> (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) ==
> @@ -154,7 +155,7 @@ static int check_locality(struct tpm_chip *chip, int l)
>
> static void release_locality(struct tpm_chip *chip, int l, int force)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
>
> if (force || (ioread8(priv->iobase + TPM_ACCESS(l)) &
> (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) ==
> @@ -165,7 +166,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;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> unsigned long stop, timeout;
> long rc;
>
> @@ -206,7 +207,7 @@ again:
>
> static u8 tpm_tis_status(struct tpm_chip *chip)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
>
> return ioread8(priv->iobase +
> TPM_STS(chip->vendor.locality));
> @@ -214,7 +215,7 @@ static u8 tpm_tis_status(struct tpm_chip *chip)
>
> static void tpm_tis_ready(struct tpm_chip *chip)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
>
> /* this causes the current command to be aborted */
> iowrite8(TPM_STS_COMMAND_READY,
> @@ -223,7 +224,7 @@ static void tpm_tis_ready(struct tpm_chip *chip)
>
> static int get_burstcount(struct tpm_chip *chip)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> unsigned long stop;
> int burstcnt;
>
> @@ -245,7 +246,7 @@ static int get_burstcount(struct tpm_chip *chip)
>
> static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> int size = 0, burstcnt;
> while (size < count &&
> wait_for_tpm_stat(chip,
> @@ -264,7 +265,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;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> int size = 0;
> int expected, status;
>
> @@ -320,7 +321,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;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> int rc, status, burstcnt;
> size_t count = 0;
>
> @@ -376,7 +377,7 @@ out_err:
>
> static void disable_interrupts(struct tpm_chip *chip)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> u32 intmask;
>
> intmask =
> @@ -396,7 +397,7 @@ static void disable_interrupts(struct tpm_chip *chip)
> */
> static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> int rc;
> u32 ordinal;
> unsigned long dur;
> @@ -434,7 +435,7 @@ out_err:
> static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len)
> {
> int rc, irq;
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
>
> if (!chip->vendor.irq || priv->irq_tested)
> return tpm_tis_send_main(chip, buf, len);
> @@ -466,7 +467,7 @@ static const struct tis_vendor_timeout_override vendor_timeout_overrides[] = {
> static bool tpm_tis_update_timeouts(struct tpm_chip *chip,
> unsigned long *timeout_cap)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> int i;
> u32 did_vid;
>
> @@ -490,7 +491,7 @@ static bool tpm_tis_update_timeouts(struct tpm_chip *chip,
> */
> static int probe_itpm(struct tpm_chip *chip)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> int rc = 0;
> u8 cmd_getticks[] = {
> 0x00, 0xc1, 0x00, 0x00, 0x00, 0x0a,
> @@ -532,7 +533,7 @@ out:
>
> static bool tpm_tis_req_canceled(struct tpm_chip *chip, u8 status)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
>
> switch (priv->manufacturer_id) {
> case TPM_VID_WINBOND:
> @@ -559,7 +560,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;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> u32 interrupt;
> int i;
>
> @@ -569,7 +570,7 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id)
> if (interrupt == 0)
> return IRQ_NONE;
>
> - ((struct priv_data *)chip->vendor.priv)->irq_tested = true;
> + priv->irq_tested = true;
> if (interrupt & TPM_INTF_DATA_AVAIL_INT)
> wake_up_interruptible(&chip->vendor.read_queue);
> if (interrupt & TPM_INTF_LOCALITY_CHANGE_INT)
> @@ -596,7 +597,7 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id)
> static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask,
> int flags, int irq)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> u8 original_int_vec;
>
> if (devm_request_irq(&chip->dev, irq, tis_int_handler, flags,
> @@ -649,7 +650,7 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask,
> */
> static void tpm_tis_probe_irq(struct tpm_chip *chip, u32 intmask)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> u8 original_int_vec;
> int i;
>
> @@ -673,7 +674,7 @@ MODULE_PARM_DESC(interrupts, "Enable interrupts");
>
> static void tpm_tis_remove(struct tpm_chip *chip)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
>
> if (chip->flags & TPM_CHIP_FLAG_TPM2)
> tpm2_shutdown(chip, TPM2_SU_CLEAR);
> @@ -702,7 +703,6 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info,
> if (IS_ERR(chip))
> return PTR_ERR(chip);
>
> - chip->vendor.priv = priv;
> #ifdef CONFIG_ACPI
> chip->acpi_dev_handle = acpi_dev_handle;
> #endif
> @@ -717,6 +717,8 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info,
> chip->vendor.timeout_c = TIS_TIMEOUT_C_MAX;
> chip->vendor.timeout_d = TIS_TIMEOUT_D_MAX;
>
> + dev_set_drvdata(&chip->dev, priv);
> +
> if (wait_startup(chip, 0) != 0) {
> rc = -ENODEV;
> goto out_err;
> @@ -841,7 +843,7 @@ out_err:
> #ifdef CONFIG_PM_SLEEP
> static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)
> {
> - struct priv_data *priv = chip->vendor.priv;
> + struct priv_data *priv = dev_get_drvdata(&chip->dev);
> u32 intmask;
>
> /* reenable interrupts that device may have lost or
> diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
> index 3111f27..efd7d99 100644
> --- a/drivers/char/tpm/xen-tpmfront.c
> +++ b/drivers/char/tpm/xen-tpmfront.c
> @@ -39,7 +39,7 @@ enum status_bits {
>
> static u8 vtpm_status(struct tpm_chip *chip)
> {
> - struct tpm_private *priv = TPM_VPRIV(chip);
> + struct tpm_private *priv = dev_get_drvdata(&chip->dev);
> switch (priv->shr->state) {
> case VTPM_STATE_IDLE:
> return VTPM_STATUS_IDLE | VTPM_STATUS_CANCELED;
> @@ -60,7 +60,7 @@ static bool vtpm_req_canceled(struct tpm_chip *chip, u8 status)
>
> static void vtpm_cancel(struct tpm_chip *chip)
> {
> - struct tpm_private *priv = TPM_VPRIV(chip);
> + struct tpm_private *priv = dev_get_drvdata(&chip->dev);
> priv->shr->state = VTPM_STATE_CANCEL;
> wmb();
> notify_remote_via_evtchn(priv->evtchn);
> @@ -73,7 +73,7 @@ static unsigned int shr_data_offset(struct vtpm_shared_page *shr)
>
> static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count)
> {
> - struct tpm_private *priv = TPM_VPRIV(chip);
> + struct tpm_private *priv = dev_get_drvdata(&chip->dev);
> struct vtpm_shared_page *shr = priv->shr;
> unsigned int offset = shr_data_offset(shr);
>
> @@ -115,7 +115,7 @@ static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count)
>
> static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count)
> {
> - struct tpm_private *priv = TPM_VPRIV(chip);
> + struct tpm_private *priv = dev_get_drvdata(&chip->dev);
> struct vtpm_shared_page *shr = priv->shr;
> unsigned int offset = shr_data_offset(shr);
> size_t length = shr->length;
> @@ -182,7 +182,7 @@ static int setup_chip(struct device *dev, struct tpm_private *priv)
> init_waitqueue_head(&chip->vendor.read_queue);
>
> priv->chip = chip;
> - TPM_VPRIV(chip) = priv;
> + dev_set_drvdata(&chip->dev, priv);
>
> return 0;
> }
> @@ -318,10 +318,10 @@ static int tpmfront_probe(struct xenbus_device *dev,
> static int tpmfront_remove(struct xenbus_device *dev)
> {
> struct tpm_chip *chip = dev_get_drvdata(&dev->dev);
> - struct tpm_private *priv = TPM_VPRIV(chip);
> + struct tpm_private *priv = dev_get_drvdata(&chip->dev);
> tpm_chip_unregister(chip);
> ring_free(priv);
> - TPM_VPRIV(chip) = NULL;
> + dev_set_drvdata(&chip->dev, NULL);
> return 0;
> }
>
> --
> 2.5.0
>
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
next prev parent reply other threads:[~2016-03-29 14:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-26 7:00 [PATCH v2 0/7] Remove the tpm_vendor_specific structure Christophe Ricard
[not found] ` <1458975615-8095-1-git-send-email-christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
2016-03-26 7:00 ` [PATCH v2 1/7] tpm/tpm_atmel: drop remaining 'iobase' usage Christophe Ricard
[not found] ` <1458975615-8095-2-git-send-email-christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
2016-03-29 14:08 ` Jarkko Sakkinen
[not found] ` <20160329140814.GA12764-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-03-29 14:45 ` Christophe Ricard
[not found] ` <56FA9514.9070507-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-03-30 10:22 ` Jarkko Sakkinen
2016-03-26 7:00 ` [PATCH v2 2/7] tpm: Remove useless priv field in struct tpm_vendor_specific Christophe Ricard
[not found] ` <1458975615-8095-3-git-send-email-christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
2016-03-29 14:19 ` Jarkko Sakkinen [this message]
2016-03-26 7:00 ` [PATCH v2 3/7] tpm/tpm_i2c_atmel: simplify patch to get tpm_chip from an i2c_client Christophe Ricard
2016-03-26 7:00 ` [PATCH v2 4/7] tpm/tpm_i2c_atmel: Few code style fixes Christophe Ricard
[not found] ` <1458975615-8095-5-git-send-email-christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
2016-03-29 14:17 ` Jarkko Sakkinen
2016-03-26 7:00 ` [PATCH v2 5/7] tpm: drop 'irq' from struct tpm_vendor_specific Christophe Ricard
[not found] ` <1458975615-8095-6-git-send-email-christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
2016-03-29 14:22 ` Jarkko Sakkinen
2016-03-26 7:00 ` [PATCH v2 6/7] tpm: Move remaining tpm_vendor_specific structure data to tpm_chip Christophe Ricard
[not found] ` <1458975615-8095-7-git-send-email-christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
2016-03-29 14:27 ` Jarkko Sakkinen
2016-03-26 7:00 ` [PATCH v2 7/7] tpm: drop 'read_queue' from struct tpm_vendor_specific Christophe Ricard
2016-03-29 14:10 ` [PATCH v2 0/7] Remove the tpm_vendor_specific structure Jarkko Sakkinen
[not found] ` <20160329141029.GB12764-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-03-29 15:09 ` Christophe Ricard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160329141933.GD12764@intel.com \
--to=jarkko.sakkinen-vuqaysv1563yd54fqh9/ca@public.gmane.org \
--cc=ashley-fm2HMyfA2y6tG0bUXCXiUA@public.gmane.org \
--cc=benoit.houyere-qxv4g6HH51o@public.gmane.org \
--cc=christophe-h.ricard-qxv4g6HH51o@public.gmane.org \
--cc=christophe.ricard-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=jean-luc.blanc-qxv4g6HH51o@public.gmane.org \
--cc=tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).