|
@@ -352,9 +352,8 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
|
|
|
do {
|
|
|
msleep(1);
|
|
|
status = inb_p(SMBHSTSTS);
|
|
|
- }
|
|
|
- while ((!(status & SMBHSTSTS_BYTE_DONE))
|
|
|
- && (timeout++ < MAX_TIMEOUT));
|
|
|
+ } while ((!(status & SMBHSTSTS_BYTE_DONE))
|
|
|
+ && (timeout++ < MAX_TIMEOUT));
|
|
|
|
|
|
result = i801_check_post(status, timeout > MAX_TIMEOUT);
|
|
|
if (result < 0)
|
|
@@ -451,9 +450,9 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write,
|
|
|
}
|
|
|
|
|
|
/* Return negative errno on error. */
|
|
|
-static s32 i801_access(struct i2c_adapter * adap, u16 addr,
|
|
|
+static s32 i801_access(struct i2c_adapter *adap, u16 addr,
|
|
|
unsigned short flags, char read_write, u8 command,
|
|
|
- int size, union i2c_smbus_data * data)
|
|
|
+ int size, union i2c_smbus_data *data)
|
|
|
{
|
|
|
int hwpec;
|
|
|
int block = 0;
|
|
@@ -522,7 +521,7 @@ static s32 i801_access(struct i2c_adapter * adap, u16 addr,
|
|
|
else
|
|
|
outb_p(inb_p(SMBAUXCTL) & (~SMBAUXCTL_CRC), SMBAUXCTL);
|
|
|
|
|
|
- if(block)
|
|
|
+ if (block)
|
|
|
ret = i801_block_transaction(data, read_write, size, hwpec);
|
|
|
else
|
|
|
ret = i801_transaction(xact | ENABLE_INT9);
|
|
@@ -534,9 +533,9 @@ static s32 i801_access(struct i2c_adapter * adap, u16 addr,
|
|
|
outb_p(inb_p(SMBAUXCTL) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B),
|
|
|
SMBAUXCTL);
|
|
|
|
|
|
- if(block)
|
|
|
+ if (block)
|
|
|
return ret;
|
|
|
- if(ret)
|
|
|
+ if (ret)
|
|
|
return ret;
|
|
|
if ((read_write == I2C_SMBUS_WRITE) || (xact == I801_QUICK))
|
|
|
return 0;
|
|
@@ -596,7 +595,7 @@ static const struct pci_device_id i801_ids[] = {
|
|
|
{ 0, }
|
|
|
};
|
|
|
|
|
|
-MODULE_DEVICE_TABLE (pci, i801_ids);
|
|
|
+MODULE_DEVICE_TABLE(pci, i801_ids);
|
|
|
|
|
|
#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE
|
|
|
static unsigned char apanel_addr;
|
|
@@ -700,7 +699,8 @@ static void __devinit dmi_check_onboard_devices(const struct dmi_header *dm,
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|
|
+static int __devinit i801_probe(struct pci_dev *dev,
|
|
|
+ const struct pci_device_id *id)
|
|
|
{
|
|
|
unsigned char temp;
|
|
|
int err, i;
|