mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
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>
This commit is contained in:
parent
e0e8398c7a
commit
3fb21c64b6
1 changed files with 10 additions and 10 deletions
|
@ -352,9 +352,8 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
|
||||||
do {
|
do {
|
||||||
msleep(1);
|
msleep(1);
|
||||||
status = inb_p(SMBHSTSTS);
|
status = inb_p(SMBHSTSTS);
|
||||||
}
|
} while ((!(status & SMBHSTSTS_BYTE_DONE))
|
||||||
while ((!(status & SMBHSTSTS_BYTE_DONE))
|
&& (timeout++ < MAX_TIMEOUT));
|
||||||
&& (timeout++ < MAX_TIMEOUT));
|
|
||||||
|
|
||||||
result = i801_check_post(status, timeout > MAX_TIMEOUT);
|
result = i801_check_post(status, timeout > MAX_TIMEOUT);
|
||||||
if (result < 0)
|
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. */
|
/* 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,
|
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 hwpec;
|
||||||
int block = 0;
|
int block = 0;
|
||||||
|
@ -522,7 +521,7 @@ static s32 i801_access(struct i2c_adapter * adap, u16 addr,
|
||||||
else
|
else
|
||||||
outb_p(inb_p(SMBAUXCTL) & (~SMBAUXCTL_CRC), SMBAUXCTL);
|
outb_p(inb_p(SMBAUXCTL) & (~SMBAUXCTL_CRC), SMBAUXCTL);
|
||||||
|
|
||||||
if(block)
|
if (block)
|
||||||
ret = i801_block_transaction(data, read_write, size, hwpec);
|
ret = i801_block_transaction(data, read_write, size, hwpec);
|
||||||
else
|
else
|
||||||
ret = i801_transaction(xact | ENABLE_INT9);
|
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),
|
outb_p(inb_p(SMBAUXCTL) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B),
|
||||||
SMBAUXCTL);
|
SMBAUXCTL);
|
||||||
|
|
||||||
if(block)
|
if (block)
|
||||||
return ret;
|
return ret;
|
||||||
if(ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
if ((read_write == I2C_SMBUS_WRITE) || (xact == I801_QUICK))
|
if ((read_write == I2C_SMBUS_WRITE) || (xact == I801_QUICK))
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -596,7 +595,7 @@ static const struct pci_device_id i801_ids[] = {
|
||||||
{ 0, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
|
|
||||||
MODULE_DEVICE_TABLE (pci, i801_ids);
|
MODULE_DEVICE_TABLE(pci, i801_ids);
|
||||||
|
|
||||||
#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE
|
#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE
|
||||||
static unsigned char apanel_addr;
|
static unsigned char apanel_addr;
|
||||||
|
@ -700,7 +699,8 @@ static void __devinit dmi_check_onboard_devices(const struct dmi_header *dm,
|
||||||
}
|
}
|
||||||
#endif
|
#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;
|
unsigned char temp;
|
||||||
int err, i;
|
int err, i;
|
||||||
|
|
Loading…
Reference in a new issue