leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tpm/tpm_i2c_stm_st33: Few code cleanup

Browse Source 
Cleanup code indentation, braces, test variable when NULL.

Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
This commit is contained in:
Christophe Ricard 2014-12-01 19:32:57 +01:00 committed by Peter Huewe
parent e8f6f3b4d6
commit 8dcd19874f
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/char/tpm/tpm_i2c_stm_st33.c
View File

@ -26,7 +26,7 @@
* *
* @Synopsis: * @Synopsis:
* 09/15/2010: First shot driver tpm_tis driver for * 09/15/2010: First shot driver tpm_tis driver for
lpc is used as model. * lpc is used as model.
*/ */
#include <linux/pci.h> #include <linux/pci.h>
@ -393,7 +393,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
long ret; long ret;
u8 status; u8 status;
if (chip->vendor.irq) { if (chip->vendor.irq) {
ret = wait_for_serirq_timeout(chip, ((tpm_stm_i2c_status ret = wait_for_serirq_timeout(chip, ((tpm_stm_i2c_status
(chip) & mask) == (chip) & mask) ==
mask), timeout); mask), timeout);
@ -429,8 +429,7 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
wait_for_stat(chip, wait_for_stat(chip,
TPM_STS_DATA_AVAIL | TPM_STS_VALID, TPM_STS_DATA_AVAIL | TPM_STS_VALID,
chip->vendor.timeout_c, chip->vendor.timeout_c,
&chip->vendor.read_queue) &chip->vendor.read_queue) == 0) {
== 0) {
burstcnt = get_burstcount(chip); burstcnt = get_burstcount(chip);
if (burstcnt < 0) if (burstcnt < 0)
return burstcnt; return burstcnt;
@ -482,7 +481,7 @@ static int tpm_stm_i2c_send(struct tpm_chip *chip, unsigned char *buf,
struct i2c_client *client; struct i2c_client *client;
struct tpm_stm_dev *tpm_dev; struct tpm_stm_dev *tpm_dev;
if (chip == NULL) if (!chip)
return -EBUSY; return -EBUSY;
if (len < TPM_HEADER_SIZE) if (len < TPM_HEADER_SIZE)
return -EBUSY; return -EBUSY;
@ -559,7 +558,7 @@ static int tpm_stm_i2c_recv(struct tpm_chip *chip, unsigned char *buf,
int size = 0; int size = 0;
int expected; int expected;
if (chip == NULL) if (!chip)
return -EBUSY; return -EBUSY;
if (count < TPM_HEADER_SIZE) { if (count < TPM_HEADER_SIZE) {
@ -580,7 +579,7 @@ static int tpm_stm_i2c_recv(struct tpm_chip *chip, unsigned char *buf,
} }
size += recv_data(chip, &buf[TPM_HEADER_SIZE], size += recv_data(chip, &buf[TPM_HEADER_SIZE],
expected - TPM_HEADER_SIZE); expected - TPM_HEADER_SIZE);
if (size < expected) { if (size < expected) {
dev_err(chip->dev, "Unable to read remainder of result\n"); dev_err(chip->dev, "Unable to read remainder of result\n");
size = -ETIME; size = -ETIME;
@ -662,9 +661,9 @@ static int tpm_stm_i2c_request_resources(struct i2c_client *client,
int ret; int ret;
pdata = client->dev.platform_data; pdata = client->dev.platform_data;
if (pdata == NULL) { if (!pdata) {
pr_err("No platform data\n"); dev_err(chip->dev, "No platform data\n");
return -EINVAL; return -ENODEV;
} }
/* store for late use */ /* store for late use */
@ -695,13 +694,13 @@ static int
tpm_stm_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) tpm_stm_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)
{ {
int ret; int ret;
u8 intmask; u8 intmask = 0;
struct tpm_chip *chip; struct tpm_chip *chip;
struct st33zp24_platform_data *platform_data; struct st33zp24_platform_data *platform_data;
struct tpm_stm_dev *tpm_dev; struct tpm_stm_dev *tpm_dev;
if (client == NULL) { if (!client) {
pr_info("%s: i2c client is NULL. Device not accessible.\n", dev_info(&client->dev, "%s: i2c client is NULL. Device not accessible.\n",
__func__); __func__);
return -ENODEV; return -ENODEV;
} }
@ -805,7 +804,7 @@ _tpm_clean_answer:
/* /*
* tpm_stm_i2c_remove remove the TPM device * tpm_stm_i2c_remove remove the TPM device
* @param: client, the i2c_client drescription (TPM I2C description). * @param: client, the i2c_client drescription (TPM I2C description).
clear_bit(0, &chip->is_open); * clear_bit(0, &chip->is_open);
* @return: 0 in case of success. * @return: 0 in case of success.
*/ */
static int tpm_stm_i2c_remove(struct i2c_client *client) static int tpm_stm_i2c_remove(struct i2c_client *client)
@ -835,6 +834,7 @@ static int tpm_stm_i2c_pm_suspend(struct device *dev)
gpio_set_value(pin_infos->io_lpcpd, 0); gpio_set_value(pin_infos->io_lpcpd, 0);
else else
ret = tpm_pm_suspend(dev); ret = tpm_pm_suspend(dev);
return ret; return ret;
} /* tpm_stm_i2c_suspend() */ } /* tpm_stm_i2c_suspend() */
@ -869,6 +869,7 @@ static const struct i2c_device_id tpm_stm_i2c_id[] = {
{TPM_ST33_I2C, 0}, {TPM_ST33_I2C, 0},
{} {}
}; };
MODULE_DEVICE_TABLE(i2c, tpm_stm_i2c_id);
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id of_st33zp24_i2c_match[] = { static const struct of_device_id of_st33zp24_i2c_match[] = {
@ -878,7 +879,6 @@ static const struct of_device_id of_st33zp24_i2c_match[] = {
MODULE_DEVICE_TABLE(of, of_st33zp24_i2c_match); MODULE_DEVICE_TABLE(of, of_st33zp24_i2c_match);
#endif #endif
MODULE_DEVICE_TABLE(i2c, tpm_stm_i2c_id);
static SIMPLE_DEV_PM_OPS(tpm_stm_i2c_ops, tpm_stm_i2c_pm_suspend, static SIMPLE_DEV_PM_OPS(tpm_stm_i2c_ops, tpm_stm_i2c_pm_suspend,
tpm_stm_i2c_pm_resume); tpm_stm_i2c_pm_resume);
static struct i2c_driver tpm_stm_i2c_driver = { static struct i2c_driver tpm_stm_i2c_driver = {
@ -887,7 +887,7 @@ static struct i2c_driver tpm_stm_i2c_driver = {
.name = TPM_ST33_I2C, .name = TPM_ST33_I2C,
.pm = &tpm_stm_i2c_ops, .pm = &tpm_stm_i2c_ops,
.of_match_table = of_match_ptr(of_st33zp24_i2c_match), .of_match_table = of_match_ptr(of_st33zp24_i2c_match),
}, },
.probe = tpm_stm_i2c_probe, .probe = tpm_stm_i2c_probe,
.remove = tpm_stm_i2c_remove, .remove = tpm_stm_i2c_remove,
.id_table = tpm_stm_i2c_id .id_table = tpm_stm_i2c_id