tpm/tpm_i2c_stm_st33: Few code cleanup

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>

1 files changed, 16 insertions, 16 deletions

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