aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorIvo Manca <pinkel@gmail.com>2010-05-21 12:40:55 -0400
committerJean Delvare <khali@linux-fr.org>2010-05-21 12:40:55 -0400
commit3fb21c64b63e2a98755aaad7b90ba9b711491b7e (patch)
treed60bacebdac046dd0f14a51a326691b30bbd8d09 /drivers/i2c
parente0e8398c7a40f1fb65cefa9d35ed6cd84cee6008 (diff)
i2c-i801: Fix all checkpatch warnings
Fix all checkpatch warnings. No functional changes are made. Signed-off-by: Ivo Manca <pinkel@gmail.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-i801.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 878299cd0ef8..f4b21f2bb8ed 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -352,9 +352,8 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
352 do { 352 do {
353 msleep(1); 353 msleep(1);
354 status = inb_p(SMBHSTSTS); 354 status = inb_p(SMBHSTSTS);
355 } 355 } while ((!(status & SMBHSTSTS_BYTE_DONE))
356 while ((!(status & SMBHSTSTS_BYTE_DONE)) 356 && (timeout++ < MAX_TIMEOUT));
357 && (timeout++ < MAX_TIMEOUT));
358 357
359 result = i801_check_post(status, timeout > MAX_TIMEOUT); 358 result = i801_check_post(status, timeout > MAX_TIMEOUT);
360 if (result < 0) 359 if (result < 0)
@@ -451,9 +450,9 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write,
451} 450}
452 451
453/* Return negative errno on error. */ 452/* Return negative errno on error. */
454static s32 i801_access(struct i2c_adapter * adap, u16 addr, 453static s32 i801_access(struct i2c_adapter *adap, u16 addr,
455 unsigned short flags, char read_write, u8 command, 454 unsigned short flags, char read_write, u8 command,
456 int size, union i2c_smbus_data * data) 455 int size, union i2c_smbus_data *data)
457{ 456{
458 int hwpec; 457 int hwpec;
459 int block = 0; 458 int block = 0;
@@ -522,7 +521,7 @@ static s32 i801_access(struct i2c_adapter * adap, u16 addr,
522 else 521 else
523 outb_p(inb_p(SMBAUXCTL) & (~SMBAUXCTL_CRC), SMBAUXCTL); 522 outb_p(inb_p(SMBAUXCTL) & (~SMBAUXCTL_CRC), SMBAUXCTL);
524 523
525 if(block) 524 if (block)
526 ret = i801_block_transaction(data, read_write, size, hwpec); 525 ret = i801_block_transaction(data, read_write, size, hwpec);
527 else 526 else
528 ret = i801_transaction(xact | ENABLE_INT9); 527 ret = i801_transaction(xact | ENABLE_INT9);
@@ -534,9 +533,9 @@ static s32 i801_access(struct i2c_adapter * adap, u16 addr,
534 outb_p(inb_p(SMBAUXCTL) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), 533 outb_p(inb_p(SMBAUXCTL) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B),
535 SMBAUXCTL); 534 SMBAUXCTL);
536 535
537 if(block) 536 if (block)
538 return ret; 537 return ret;
539 if(ret) 538 if (ret)
540 return ret; 539 return ret;
541 if ((read_write == I2C_SMBUS_WRITE) || (xact == I801_QUICK)) 540 if ((read_write == I2C_SMBUS_WRITE) || (xact == I801_QUICK))
542 return 0; 541 return 0;
@@ -596,7 +595,7 @@ static const struct pci_device_id i801_ids[] = {
596 { 0, } 595 { 0, }
597}; 596};
598 597
599MODULE_DEVICE_TABLE (pci, i801_ids); 598MODULE_DEVICE_TABLE(pci, i801_ids);
600 599
601#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE 600#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE
602static unsigned char apanel_addr; 601static unsigned char apanel_addr;
@@ -700,7 +699,8 @@ static void __devinit dmi_check_onboard_devices(const struct dmi_header *dm,
700} 699}
701#endif 700#endif
702 701
703static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id *id) 702static int __devinit i801_probe(struct pci_dev *dev,
703 const struct pci_device_id *id)
704{ 704{
705 unsigned char temp; 705 unsigned char temp;
706 int err, i; 706 int err, i;