Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 352868
b: refs/heads/master
c: d479042
h: refs/heads/master
v: v3
  • Loading branch information
Kent Yoder committed Feb 5, 2013
1 parent 52b0d6d commit 17e9119
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7240b98320a28f1d41b9361dc1cc8244dfda0272
refs/heads/master: d479042c82941772cb1c003b46707d55185a49f6
18 changes: 1 addition & 17 deletions trunk/drivers/char/tpm/tpm_i2c_stm_st33.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -462,23 +457,18 @@ 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;
if (len < TPM_HEADER_SIZE)
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;

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 17e9119

Please sign in to comment.