summaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm
diff options
context:
space:
mode:
authorKent Yoder <key@linux.vnet.ibm.com>2013-01-29 16:43:54 +0100
committerKent Yoder <key@linux.vnet.ibm.com>2013-02-05 16:38:25 +0100
commitd479042c82941772cb1c003b46707d55185a49f6 (patch)
tree8c9fcfd62cb396d9c694bcc89efef74e3d4e99c4 /drivers/char/tpm
parentTPM: Wait for TPM_ACCESS tpmRegValidSts to go high at startup (diff)
downloadlinux-d479042c82941772cb1c003b46707d55185a49f6.tar.xz
linux-d479042c82941772cb1c003b46707d55185a49f6.zip
tpm_i2c_stm_st33: removed unused variables/code
Reported-by: Peter Hüwe <PeterHuewe@gmx.de> Signed-off-by: Peter Hüwe <PeterHuewe@gmx.de> Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/char/tpm')
-rw-r--r--drivers/char/tpm/tpm_i2c_stm_st33.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.c b/drivers/char/tpm/tpm_i2c_stm_st33.c
index e4154bfc8be7..8c60d33d116c 100644
--- a/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -123,9 +123,6 @@ static int read8_reg(struct i2c_client *client, u8 tpm_register,
{
u8 status = 0;
u8 data;
- struct st33zp24_platform_data *pin_infos;
-
- pin_infos = client->dev.platform_data;
data = TPM_DUMMY_BYTE;
status = write8_reg(client, tpm_register, &data, 1);
@@ -203,10 +200,8 @@ static int wait_for_serirq_timeout(struct tpm_chip *chip, bool condition,
{
int status = 2;
struct i2c_client *client;
- struct st33zp24_platform_data *pin_infos;
client = (struct i2c_client *) TPM_VPRIV(chip);
- pin_infos = client->dev.platform_data;
status = _wait_for_interrupt_serirq_timeout(chip, timeout);
if (!status) {
@@ -462,13 +457,11 @@ static irqreturn_t tpm_ioserirq_handler(int irq, void *dev_id)
static int tpm_stm_i2c_send(struct tpm_chip *chip, unsigned char *buf,
size_t len)
{
- u32 ordinal,
- status,
+ u32 status,
burstcnt = 0, i, size;
int ret;
u8 data;
struct i2c_client *client;
- struct st33zp24_platform_data *pin_infos;
if (chip == NULL)
return -EBUSY;
@@ -476,9 +469,6 @@ static int tpm_stm_i2c_send(struct tpm_chip *chip, unsigned char *buf,
return -EBUSY;
client = (struct i2c_client *)TPM_VPRIV(chip);
- pin_infos = client->dev.platform_data;
-
- ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));
client->flags = 0;
@@ -547,15 +537,9 @@ static int tpm_stm_i2c_recv(struct tpm_chip *chip, unsigned char *buf,
int size = 0;
int expected;
- struct i2c_client *client;
- struct st33zp24_platform_data *pin_infos;
-
if (chip == NULL)
return -EBUSY;
- client = (struct i2c_client *)TPM_VPRIV(chip);
- pin_infos = client->dev.platform_data;
-
if (count < TPM_HEADER_SIZE) {
size = -EIO;
goto out;