i2c: nforce2: fix coding style issues

avoid these checkpatch.pl issues :
- ERROR: "foo * bar" should be "foo *bar"
- ERROR: switch and case should be at the same indent
- ERROR: "(foo*)" should be "(foo *)"
- ERROR: do not use assignment in if condition
- ERROR: space required before the open parenthesis '('
- WARNING: suspect code indent for conditional statements
- WARNING: quoted string split across lines
- WARNING: space prohibited between function name and open parenthesis '('
- WARNING: line over 80 characters
also add spaces around some "+", "=", "*"

Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
Reviewed-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>

diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index adac854..ac88f40 100644 (file)
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -60,7 +60,7 @@
 #include <linux/io.h>
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR ("Hans-Frieder Vogt <hfvogt@gmx.net>");
+MODULE_AUTHOR("Hans-Frieder Vogt <hfvogt@gmx.net>");
 MODULE_DESCRIPTION("nForce2/3/4/5xx SMBus driver");
 
 
@@ -188,9 +188,9 @@ static int nforce2_check_status(struct i2c_adapter *adap)
 }
 
 /* Return negative errno on error */
-static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
+static s32 nforce2_access(struct i2c_adapter *adap, u16 addr,
                unsigned short flags, char read_write,
-               u8 command, int size, union i2c_smbus_data * data)
+               u8 command, int size, union i2c_smbus_data *data)
 {
        struct nforce2_smbus *smbus = adap->algo_data;
        unsigned char protocol, pec;
@@ -202,56 +202,54 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
        pec = (flags & I2C_CLIENT_PEC) ? NVIDIA_SMB_PRTCL_PEC : 0;
 
        switch (size) {
+       case I2C_SMBUS_QUICK:
+               protocol |= NVIDIA_SMB_PRTCL_QUICK;
+               read_write = I2C_SMBUS_WRITE;
+               break;
 
-               case I2C_SMBUS_QUICK:
-                       protocol |= NVIDIA_SMB_PRTCL_QUICK;
-                       read_write = I2C_SMBUS_WRITE;
-                       break;
-
-               case I2C_SMBUS_BYTE:
-                       if (read_write == I2C_SMBUS_WRITE)
-                               outb_p(command, NVIDIA_SMB_CMD);
-                       protocol |= NVIDIA_SMB_PRTCL_BYTE;
-                       break;
-
-               case I2C_SMBUS_BYTE_DATA:
-                       outb_p(command, NVIDIA_SMB_CMD);
-                       if (read_write == I2C_SMBUS_WRITE)
-                               outb_p(data->byte, NVIDIA_SMB_DATA);
-                       protocol |= NVIDIA_SMB_PRTCL_BYTE_DATA;
-                       break;
-
-               case I2C_SMBUS_WORD_DATA:
+       case I2C_SMBUS_BYTE:
+               if (read_write == I2C_SMBUS_WRITE)
                        outb_p(command, NVIDIA_SMB_CMD);
-                       if (read_write == I2C_SMBUS_WRITE) {
-                                outb_p(data->word, NVIDIA_SMB_DATA);
-                                outb_p(data->word >> 8, NVIDIA_SMB_DATA+1);
-                       }
-                       protocol |= NVIDIA_SMB_PRTCL_WORD_DATA | pec;
-                       break;
-
-               case I2C_SMBUS_BLOCK_DATA:
-                       outb_p(command, NVIDIA_SMB_CMD);
-                       if (read_write == I2C_SMBUS_WRITE) {
-                               len = data->block[0];
-                               if ((len == 0) || (len > I2C_SMBUS_BLOCK_MAX)) {
-                                       dev_err(&adap->dev,
-                                               "Transaction failed "
-                                               "(requested block size: %d)\n",
-                                               len);
-                                       return -EINVAL;
-                               }
-                               outb_p(len, NVIDIA_SMB_BCNT);
-                               for (i = 0; i < I2C_SMBUS_BLOCK_MAX; i++)
-                                       outb_p(data->block[i + 1],
-                                              NVIDIA_SMB_DATA+i);
+               protocol |= NVIDIA_SMB_PRTCL_BYTE;
+               break;
+
+       case I2C_SMBUS_BYTE_DATA:
+               outb_p(command, NVIDIA_SMB_CMD);
+               if (read_write == I2C_SMBUS_WRITE)
+                       outb_p(data->byte, NVIDIA_SMB_DATA);
+               protocol |= NVIDIA_SMB_PRTCL_BYTE_DATA;
+               break;
+
+       case I2C_SMBUS_WORD_DATA:
+               outb_p(command, NVIDIA_SMB_CMD);
+               if (read_write == I2C_SMBUS_WRITE) {
+                       outb_p(data->word, NVIDIA_SMB_DATA);
+                       outb_p(data->word >> 8, NVIDIA_SMB_DATA + 1);
+               }
+               protocol |= NVIDIA_SMB_PRTCL_WORD_DATA | pec;
+               break;
+
+       case I2C_SMBUS_BLOCK_DATA:
+               outb_p(command, NVIDIA_SMB_CMD);
+               if (read_write == I2C_SMBUS_WRITE) {
+                       len = data->block[0];
+                       if ((len == 0) || (len > I2C_SMBUS_BLOCK_MAX)) {
+                               dev_err(&adap->dev,
+                                       "Transaction failed (requested block size: %d)\n",
+                                       len);
+                               return -EINVAL;
                        }
-                       protocol |= NVIDIA_SMB_PRTCL_BLOCK_DATA | pec;
-                       break;
+                       outb_p(len, NVIDIA_SMB_BCNT);
+                       for (i = 0; i < I2C_SMBUS_BLOCK_MAX; i++)
+                               outb_p(data->block[i + 1],
+                                      NVIDIA_SMB_DATA + i);
+               }
+               protocol |= NVIDIA_SMB_PRTCL_BLOCK_DATA | pec;
+               break;
 
-               default:
-                       dev_err(&adap->dev, "Unsupported transaction %d\n", size);
-                       return -EOPNOTSUPP;
+       default:
+               dev_err(&adap->dev, "Unsupported transaction %d\n", size);
+               return -EOPNOTSUPP;
        }
 
        outb_p((addr & 0x7f) << 1, NVIDIA_SMB_ADDR);
@@ -265,28 +263,28 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
                return 0;
 
        switch (size) {
-
-               case I2C_SMBUS_BYTE:
-               case I2C_SMBUS_BYTE_DATA:
-                       data->byte = inb_p(NVIDIA_SMB_DATA);
-                       break;
-
-               case I2C_SMBUS_WORD_DATA:
-                       data->word = inb_p(NVIDIA_SMB_DATA) | (inb_p(NVIDIA_SMB_DATA+1) << 8);
-                       break;
-
-               case I2C_SMBUS_BLOCK_DATA:
-                       len = inb_p(NVIDIA_SMB_BCNT);
-                       if ((len <= 0) || (len > I2C_SMBUS_BLOCK_MAX)) {
-                               dev_err(&adap->dev, "Transaction failed "
-                                       "(received block size: 0x%02x)\n",
-                                       len);
-                               return -EPROTO;
-                       }
-                       for (i = 0; i < len; i++)
-                               data->block[i+1] = inb_p(NVIDIA_SMB_DATA + i);
-                       data->block[0] = len;
-                       break;
+       case I2C_SMBUS_BYTE:
+       case I2C_SMBUS_BYTE_DATA:
+               data->byte = inb_p(NVIDIA_SMB_DATA);
+               break;
+
+       case I2C_SMBUS_WORD_DATA:
+               data->word = inb_p(NVIDIA_SMB_DATA) |
+                            (inb_p(NVIDIA_SMB_DATA + 1) << 8);
+               break;
+
+       case I2C_SMBUS_BLOCK_DATA:
+               len = inb_p(NVIDIA_SMB_BCNT);
+               if ((len <= 0) || (len > I2C_SMBUS_BLOCK_MAX)) {
+                       dev_err(&adap->dev,
+                               "Transaction failed (received block size: 0x%02x)\n",
+                               len);
+                       return -EPROTO;
+               }
+               for (i = 0; i < len; i++)
+                       data->block[i + 1] = inb_p(NVIDIA_SMB_DATA + i);
+               data->block[0] = len;
+               break;
        }
 
        return 0;
@@ -299,7 +297,7 @@ static u32 nforce2_func(struct i2c_adapter *adapter)
        return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
               I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
               I2C_FUNC_SMBUS_PEC |
-              (((struct nforce2_smbus*)adapter->algo_data)->blockops ?
+              (((struct nforce2_smbus *)adapter->algo_data)->blockops ?
                I2C_FUNC_SMBUS_BLOCK_DATA : 0);
 }
 
@@ -327,7 +325,7 @@ static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = {
        { 0 }
 };
 
-MODULE_DEVICE_TABLE (pci, nforce2_ids);
+MODULE_DEVICE_TABLE(pci, nforce2_ids);
 
 
 static int nforce2_probe_smb(struct pci_dev *dev, int bar, int alt_reg,
@@ -377,7 +375,8 @@ static int nforce2_probe_smb(struct pci_dev *dev, int bar, int alt_reg,
                release_region(smbus->base, smbus->size);
                return error;
        }
-       dev_info(&smbus->adapter.dev, "nForce2 SMBus adapter at %#x\n", smbus->base);
+       dev_info(&smbus->adapter.dev, "nForce2 SMBus adapter at %#x\n",
+               smbus->base);
        return 0;
 }
 
@@ -388,11 +387,12 @@ static int nforce2_probe(struct pci_dev *dev, const struct pci_device_id *id)
        int res1, res2;
 
        /* we support 2 SMBus adapters */
-       if (!(smbuses = kzalloc(2*sizeof(struct nforce2_smbus), GFP_KERNEL)))
+       smbuses = kzalloc(2 * sizeof(struct nforce2_smbus), GFP_KERNEL);
+       if (!smbuses)
                return -ENOMEM;
        pci_set_drvdata(dev, smbuses);
 
-       switch(dev->device) {
+       switch (dev->device) {
        case PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS:
        case PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS:
        case PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS: