Commit 7ac3e13a authored by Geordan Neukum's avatar Geordan Neukum Committed by Greg Kroah-Hartman

staging: kpc2000: kpc_i2c: fixup block comment style in i2c_driver.c

Throughout i2c_driver.c, there are numerous deviations from the two
standards of:
	- placing a '*' at the beginning of every line containing a
	  block comment.
	- placing the closing comment marker '*/' on a new line.

Instead, use a block comment style that is more consistent with the
prescribed guidelines.
Signed-off-by: default avatarGeordan Neukum <gneukum1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03a51687
...@@ -137,7 +137,8 @@ MODULE_PARM_DESC(disable_features, "Disable selected driver features"); ...@@ -137,7 +137,8 @@ MODULE_PARM_DESC(disable_features, "Disable selected driver features");
#define outb_p(d,a) writeq(d,(void*)a) #define outb_p(d,a) writeq(d,(void*)a)
/* Make sure the SMBus host is ready to start transmitting. /* Make sure the SMBus host is ready to start transmitting.
Return 0 if it is, -EBUSY if it is not. */ * Return 0 if it is, -EBUSY if it is not.
*/
static int i801_check_pre(struct i2c_device *priv) static int i801_check_pre(struct i2c_device *priv)
{ {
int status; int status;
...@@ -226,7 +227,8 @@ static int i801_transaction(struct i2c_device *priv, int xact) ...@@ -226,7 +227,8 @@ static int i801_transaction(struct i2c_device *priv, int xact)
return result; return result;
} }
/* the current contents of SMBHSTCNT can be overwritten, since PEC, /* the current contents of SMBHSTCNT can be overwritten, since PEC,
* INTREN, SMBSCMD are passed in xact */ * INTREN, SMBSCMD are passed in xact
*/
outb_p(xact | I801_START, SMBHSTCNT(priv)); outb_p(xact | I801_START, SMBHSTCNT(priv));
/* We will always wait for a fraction of a second! */ /* We will always wait for a fraction of a second! */
...@@ -424,8 +426,9 @@ static int i801_block_transaction(struct i2c_device *priv, union i2c_smbus_data ...@@ -424,8 +426,9 @@ static int i801_block_transaction(struct i2c_device *priv, union i2c_smbus_data
} }
/* Experience has shown that the block buffer can only be used for /* Experience has shown that the block buffer can only be used for
SMBus (not I2C) block transactions, even though the datasheet * SMBus (not I2C) block transactions, even though the datasheet
doesn't mention this limitation. */ * doesn't mention this limitation.
*/
if ((priv->features & FEATURE_BLOCK_BUFFER) && command != I2C_SMBUS_I2C_BLOCK_DATA && i801_set_block_buffer_mode(priv) == 0) { if ((priv->features & FEATURE_BLOCK_BUFFER) && command != I2C_SMBUS_I2C_BLOCK_DATA && i801_set_block_buffer_mode(priv) == 0) {
result = i801_block_transaction_by_block(priv, data, read_write, hwpec); result = i801_block_transaction_by_block(priv, data, read_write, hwpec);
} else { } else {
...@@ -499,11 +502,13 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, unsigned short flags, ...@@ -499,11 +502,13 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, unsigned short flags,
case I2C_SMBUS_I2C_BLOCK_DATA: case I2C_SMBUS_I2C_BLOCK_DATA:
dev_dbg(&priv->adapter.dev, " [acc] SMBUS_I2C_BLOCK_DATA\n"); dev_dbg(&priv->adapter.dev, " [acc] SMBUS_I2C_BLOCK_DATA\n");
/* NB: page 240 of ICH5 datasheet shows that the R/#W /* NB: page 240 of ICH5 datasheet shows that the R/#W
* bit should be cleared here, even when reading */ * bit should be cleared here, even when reading
*/
outb_p((addr & 0x7f) << 1, SMBHSTADD(priv)); outb_p((addr & 0x7f) << 1, SMBHSTADD(priv));
if (read_write == I2C_SMBUS_READ) { if (read_write == I2C_SMBUS_READ) {
/* NB: page 240 of ICH5 datasheet also shows /* NB: page 240 of ICH5 datasheet also shows
* that DATA1 is the cmd field when reading */ * that DATA1 is the cmd field when reading
*/
outb_p(command, SMBHSTDAT1(priv)); outb_p(command, SMBHSTDAT1(priv));
} else { } else {
outb_p(command, SMBHSTCMD(priv)); outb_p(command, SMBHSTCMD(priv));
...@@ -533,8 +538,9 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, unsigned short flags, ...@@ -533,8 +538,9 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, unsigned short flags,
} }
/* Some BIOSes don't like it when PEC is enabled at reboot or resume /* Some BIOSes don't like it when PEC is enabled at reboot or resume
time, so we forcibly disable it after every transaction. Turn off * time, so we forcibly disable it after every transaction. Turn off
E32B for the same reason. */ * E32B for the same reason.
*/
if (hwpec || block) { if (hwpec || block) {
dev_dbg(&priv->adapter.dev, " [acc] hwpec || block\n"); dev_dbg(&priv->adapter.dev, " [acc] hwpec || block\n");
outb_p(inb_p(SMBAUXCTL(priv)) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv)); outb_p(inb_p(SMBAUXCTL(priv)) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv));
...@@ -573,13 +579,13 @@ static u32 i801_func(struct i2c_adapter *adapter) ...@@ -573,13 +579,13 @@ static u32 i801_func(struct i2c_adapter *adapter)
struct i2c_device *priv = i2c_get_adapdata(adapter); struct i2c_device *priv = i2c_get_adapdata(adapter);
/* original settings /* original settings
u32 f = I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE | * u32 f = I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA | * I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_WRITE_I2C_BLOCK | * I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_WRITE_I2C_BLOCK |
((priv->features & FEATURE_SMBUS_PEC) ? I2C_FUNC_SMBUS_PEC : 0) | * ((priv->features & FEATURE_SMBUS_PEC) ? I2C_FUNC_SMBUS_PEC : 0) |
((priv->features & FEATURE_I2C_BLOCK_READ) ? * ((priv->features & FEATURE_I2C_BLOCK_READ) ?
I2C_FUNC_SMBUS_READ_I2C_BLOCK : 0); * I2C_FUNC_SMBUS_READ_I2C_BLOCK : 0);
*/ */
// http://lxr.free-electrons.com/source/include/uapi/linux/i2c.h#L85 // http://lxr.free-electrons.com/source/include/uapi/linux/i2c.h#L85
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment