Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e0d39d8 authored by Christophe Ricard's avatar Christophe Ricard Committed by Jarkko Sakkinen
Browse files

tpm: Remove useless priv field in struct tpm_vendor_specific 



Remove useless priv field in struct tpm_vendor_specific and take benefit
of chip->dev.driver_data.  As priv is the latest field available in
struct tpm_vendor_specific, remove any reference to that structure.

Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent af782f33

drivers/char/tpm/st33zp24/i2c.c

+10 −5
Original line number Diff line number Diff line
@@ -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);

drivers/char/tpm/st33zp24/spi.c

+10 −5
Original line number Diff line number Diff line
@@ -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);

drivers/char/tpm/st33zp24/st33zp24.c

+14 −36
Original line number Diff line number Diff line
@@ -94,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() */
@@ -110,11 +108,9 @@ static void st33zp24_cancel(struct tpm_chip *chip) 
 */

static u8 st33zp24_status(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);



	tpm_dev->ops->recv(tpm_dev->phy_id, TPM_STS, &data, 1);

	return data;

} /* st33zp24_status() */
@@ -126,12 +122,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)) ==
@@ -148,13 +142,11 @@ static int check_locality(struct tpm_chip *chip) 
 */

static int request_locality(struct tpm_chip *chip)

{

	struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);

	unsigned long stop;

	long ret;

	struct st33zp24_dev *tpm_dev;

	u8 data;



	tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);



	if (check_locality(chip) == tpm_dev->locality)

		return tpm_dev->locality;
@@ -182,10 +174,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);
@@ -198,12 +189,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->timeout_d;

	do {
@@ -263,15 +252,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);
@@ -329,10 +316,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,
@@ -362,9 +347,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(&tpm_dev->read_queue);
@@ -385,19 +368,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;
@@ -557,9 +538,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->timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT);

	chip->timeout_b = msecs_to_jiffies(TIS_LONG_TIMEOUT);
@@ -643,10 +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;

	int ret = 0;

	struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);



	tpm_dev = (struct st33zp24_dev *)TPM_VPRIV(chip);

	int ret = 0;



	if (gpio_is_valid(tpm_dev->io_lpcpd))

		gpio_set_value(tpm_dev->io_lpcpd, 0);
@@ -665,11 +645,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,

drivers/char/tpm/tpm.h

+0 −9
Original line number Diff line number Diff line
@@ -128,14 +128,6 @@ enum tpm2_startup_types { 
	TPM2_SU_STATE	= 0x0001,

};



struct tpm_chip;



struct tpm_vendor_specific {

	void *priv;

};



#define TPM_VPRIV(c)     ((c)->vendor.priv)



#define TPM_VID_INTEL    0x8086

#define TPM_VID_WINBOND  0x1050

#define TPM_VID_STM      0x104A
@@ -166,7 +158,6 @@ struct tpm_chip { 


	struct mutex tpm_mutex;	/* tpm is processing */



	struct tpm_vendor_specific vendor;

	unsigned long timeout_a; /* jiffies */

	unsigned long timeout_b; /* jiffies */

	unsigned long timeout_c; /* jiffies */

drivers/char/tpm/tpm_atmel.c

+6 −6
Original line number Diff line number Diff line
@@ -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)