AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

i2c-algo-bit: Whitespace fixes (+ NAK/ARB comments)

Browse Source 
Fix *LOTS* of whitespace goofs and checkpatch.pl warnings, strangely
parenthesized ternary expressions, and other CodingStyle glitches.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
David Brownell 2008-01-27 18:14:46 +01:00 committed by Jean Delvare
parent 59d70df025
commit cf978ab284
1 changed files with 105 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
drivers/i2c/algos/i2c-algo-bit.c
View File

@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------
/* i2c-algo-bit.c i2c driver algorithms for bit-shift adapters */ * i2c-algo-bit.c i2c driver algorithms for bit-shift adapters
/* ------------------------------------------------------------------------- */ * -------------------------------------------------------------------------
/* Copyright (C) 1995-2000 Simon G. Vogl * Copyright (C) 1995-2000 Simon G. Vogl
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
/* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
/* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki /* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki
<kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */ <kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */
@ -60,26 +60,26 @@ MODULE_PARM_DESC(i2c_debug,
/* --- setting states on the bus with the right timing: --------------- */ /* --- setting states on the bus with the right timing: --------------- */
#define setsda(adap,val) adap->setsda(adap->data, val) #define setsda(adap, val) adap->setsda(adap->data, val)
#define setscl(adap,val) adap->setscl(adap->data, val) #define setscl(adap, val) adap->setscl(adap->data, val)
#define getsda(adap) adap->getsda(adap->data) #define getsda(adap) adap->getsda(adap->data)
#define getscl(adap) adap->getscl(adap->data) #define getscl(adap) adap->getscl(adap->data)
static inline void sdalo(struct i2c_algo_bit_data *adap) static inline void sdalo(struct i2c_algo_bit_data *adap)
{ {
setsda(adap,0); setsda(adap, 0);
udelay((adap->udelay + 1) / 2); udelay((adap->udelay + 1) / 2);
} }
static inline void sdahi(struct i2c_algo_bit_data *adap) static inline void sdahi(struct i2c_algo_bit_data *adap)
{ {
setsda(adap,1); setsda(adap, 1);
udelay((adap->udelay + 1) / 2); udelay((adap->udelay + 1) / 2);
} }
static inline void scllo(struct i2c_algo_bit_data *adap) static inline void scllo(struct i2c_algo_bit_data *adap)
{ {
setscl(adap,0); setscl(adap, 0);
udelay(adap->udelay / 2); udelay(adap->udelay / 2);
} }
@ -91,22 +91,21 @@ static int sclhi(struct i2c_algo_bit_data *adap)
{ {
unsigned long start; unsigned long start;
setscl(adap,1); setscl(adap, 1);
/* Not all adapters have scl sense line... */ /* Not all adapters have scl sense line... */
if (!adap->getscl) if (!adap->getscl)
goto done; goto done;
start=jiffies; start = jiffies;
while (! getscl(adap) ) { while (!getscl(adap)) {
/* the hw knows how to read the clock line, /* This hw knows how to read the clock line, so we wait
* so we wait until it actually gets high. * until it actually gets high. This is safer as some
* This is safer as some chips may hold it low * chips may hold it low ("clock stretching") while they
* while they are processing data internally. * are processing data internally.
*/ */
if (time_after_eq(jiffies, start+adap->timeout)) { if (time_after_eq(jiffies, start + adap->timeout))
return -ETIMEDOUT; return -ETIMEDOUT;
}
cond_resched(); cond_resched();
} }
#ifdef DEBUG #ifdef DEBUG
@ -118,11 +117,11 @@ static int sclhi(struct i2c_algo_bit_data *adap)
done: done:
udelay(adap->udelay); udelay(adap->udelay);
return 0; return 0;
} }
/* --- other auxiliary functions -------------------------------------- */ /* --- other auxiliary functions -------------------------------------- */
static void i2c_start(struct i2c_algo_bit_data *adap) static void i2c_start(struct i2c_algo_bit_data *adap)
{ {
/* assert: scl, sda are high */ /* assert: scl, sda are high */
setsda(adap, 0); setsda(adap, 0);
@ -130,7 +129,7 @@ static void i2c_start(struct i2c_algo_bit_data *adap)
scllo(adap); scllo(adap);
} }
static void i2c_repstart(struct i2c_algo_bit_data *adap) static void i2c_repstart(struct i2c_algo_bit_data *adap)
{ {
/* assert: scl is low */ /* assert: scl is low */
sdahi(adap); sdahi(adap);
@ -141,18 +140,18 @@ static void i2c_repstart(struct i2c_algo_bit_data *adap)
} }
static void i2c_stop(struct i2c_algo_bit_data *adap) static void i2c_stop(struct i2c_algo_bit_data *adap)
{ {
/* assert: scl is low */ /* assert: scl is low */
sdalo(adap); sdalo(adap);
sclhi(adap); sclhi(adap);
setsda(adap, 1); setsda(adap, 1);
udelay(adap->udelay); udelay(adap->udelay);
} }
/* send a byte without start cond., look for arbitration, /* send a byte without start cond., look for arbitration,
check ackn. from slave */ check ackn. from slave */
/* returns: /* returns:
* 1 if the device acknowledged * 1 if the device acknowledged
@ -167,27 +166,33 @@ static int i2c_outb(struct i2c_adapter *i2c_adap, unsigned char c)
struct i2c_algo_bit_data *adap = i2c_adap->algo_data; struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
/* assert: scl is low */ /* assert: scl is low */
for ( i=7 ; i>=0 ; i-- ) { for (i = 7; i >= 0; i--) {
sb = (c >> i) & 1; sb = (c >> i) & 1;
setsda(adap,sb); setsda(adap, sb);
udelay((adap->udelay + 1) / 2); udelay((adap->udelay + 1) / 2);
if (sclhi(adap)<0) { /* timed out */ if (sclhi(adap) < 0) { /* timed out */
bit_dbg(1, &i2c_adap->dev, "i2c_outb: 0x%02x, " bit_dbg(1, &i2c_adap->dev, "i2c_outb: 0x%02x, "
"timeout at bit #%d\n", (int)c, i); "timeout at bit #%d\n", (int)c, i);
return -ETIMEDOUT; return -ETIMEDOUT;
}; }
/* do arbitration here: /* FIXME do arbitration here:
* if ( sb && ! getsda(adap) ) -> ouch! Get out of here. * if (sb && !getsda(adap)) -> ouch! Get out of here.
*
* Report a unique code, so higher level code can retry
* the whole (combined) message and *NOT* issue STOP.
*/ */
scllo(adap); scllo(adap);
} }
sdahi(adap); sdahi(adap);
if (sclhi(adap)<0){ /* timeout */ if (sclhi(adap) < 0) { /* timeout */
bit_dbg(1, &i2c_adap->dev, "i2c_outb: 0x%02x, " bit_dbg(1, &i2c_adap->dev, "i2c_outb: 0x%02x, "
"timeout at ack\n", (int)c); "timeout at ack\n", (int)c);
return -ETIMEDOUT; return -ETIMEDOUT;
}; }
/* read ack: SDA should be pulled down by slave */
/* read ack: SDA should be pulled down by slave, or it may
* NAK (usually to report problems with the data we wrote).
*/
ack = !getsda(adap); /* ack: sda is pulled low -> success */ ack = !getsda(adap); /* ack: sda is pulled low -> success */
bit_dbg(2, &i2c_adap->dev, "i2c_outb: 0x%02x %s\n", (int)c, bit_dbg(2, &i2c_adap->dev, "i2c_outb: 0x%02x %s\n", (int)c,
ack ? "A" : "NA"); ack ? "A" : "NA");
@ -198,24 +203,24 @@ static int i2c_outb(struct i2c_adapter *i2c_adap, unsigned char c)
} }
static int i2c_inb(struct i2c_adapter *i2c_adap) static int i2c_inb(struct i2c_adapter *i2c_adap)
{ {
/* read byte via i2c port, without start/stop sequence */ /* read byte via i2c port, without start/stop sequence */
/* acknowledge is sent in i2c_read. */ /* acknowledge is sent in i2c_read. */
int i; int i;
unsigned char indata=0; unsigned char indata = 0;
struct i2c_algo_bit_data *adap = i2c_adap->algo_data; struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
/* assert: scl is low */ /* assert: scl is low */
sdahi(adap); sdahi(adap);
for (i=0;i<8;i++) { for (i = 0; i < 8; i++) {
if (sclhi(adap)<0) { /* timeout */ if (sclhi(adap) < 0) { /* timeout */
bit_dbg(1, &i2c_adap->dev, "i2c_inb: timeout at bit " bit_dbg(1, &i2c_adap->dev, "i2c_inb: timeout at bit "
"#%d\n", 7 - i); "#%d\n", 7 - i);
return -ETIMEDOUT; return -ETIMEDOUT;
}; }
indata *= 2; indata *= 2;
if ( getsda(adap) ) if (getsda(adap))
indata |= 0x01; indata |= 0x01;
setscl(adap, 0); setscl(adap, 0);
udelay(i == 7 ? adap->udelay / 2 : adap->udelay); udelay(i == 7 ? adap->udelay / 2 : adap->udelay);
@ -228,66 +233,67 @@ static int i2c_inb(struct i2c_adapter *i2c_adap)
* Sanity check for the adapter hardware - check the reaction of * Sanity check for the adapter hardware - check the reaction of
* the bus lines only if it seems to be idle. * the bus lines only if it seems to be idle.
*/ */
static int test_bus(struct i2c_algo_bit_data *adap, char* name) { static int test_bus(struct i2c_algo_bit_data *adap, char *name)
int scl,sda; {
int scl, sda;
if (adap->getscl==NULL) if (adap->getscl == NULL)
pr_info("%s: Testing SDA only, SCL is not readable\n", name); pr_info("%s: Testing SDA only, SCL is not readable\n", name);
sda=getsda(adap); sda = getsda(adap);
scl=(adap->getscl==NULL?1:getscl(adap)); scl = (adap->getscl == NULL) ? 1 : getscl(adap);
if (!scl || !sda ) { if (!scl || !sda) {
printk(KERN_WARNING "%s: bus seems to be busy\n", name); printk(KERN_WARNING "%s: bus seems to be busy\n", name);
goto bailout; goto bailout;
} }
sdalo(adap); sdalo(adap);
sda=getsda(adap); sda = getsda(adap);
scl=(adap->getscl==NULL?1:getscl(adap)); scl = (adap->getscl == NULL) ? 1 : getscl(adap);
if ( 0 != sda ) { if (sda) {
printk(KERN_WARNING "%s: SDA stuck high!\n", name); printk(KERN_WARNING "%s: SDA stuck high!\n", name);
goto bailout; goto bailout;
} }
if ( 0 == scl ) { if (!scl) {
printk(KERN_WARNING "%s: SCL unexpected low " printk(KERN_WARNING "%s: SCL unexpected low "
"while pulling SDA low!\n", name); "while pulling SDA low!\n", name);
goto bailout; goto bailout;
} }
sdahi(adap); sdahi(adap);
sda=getsda(adap); sda = getsda(adap);
scl=(adap->getscl==NULL?1:getscl(adap)); scl = (adap->getscl == NULL) ? 1 : getscl(adap);
if ( 0 == sda ) { if (!sda) {
printk(KERN_WARNING "%s: SDA stuck low!\n", name); printk(KERN_WARNING "%s: SDA stuck low!\n", name);
goto bailout; goto bailout;
} }
if ( 0 == scl ) { if (!scl) {
printk(KERN_WARNING "%s: SCL unexpected low " printk(KERN_WARNING "%s: SCL unexpected low "
"while pulling SDA high!\n", name); "while pulling SDA high!\n", name);
goto bailout; goto bailout;
} }
scllo(adap); scllo(adap);
sda=getsda(adap); sda = getsda(adap);
scl=(adap->getscl==NULL?0:getscl(adap)); scl = (adap->getscl == NULL) ? 0 : getscl(adap);
if ( 0 != scl ) { if (scl) {
printk(KERN_WARNING "%s: SCL stuck high!\n", name); printk(KERN_WARNING "%s: SCL stuck high!\n", name);
goto bailout; goto bailout;
} }
if ( 0 == sda ) { if (!sda) {
printk(KERN_WARNING "%s: SDA unexpected low " printk(KERN_WARNING "%s: SDA unexpected low "
"while pulling SCL low!\n", name); "while pulling SCL low!\n", name);
goto bailout; goto bailout;
} }
sclhi(adap); sclhi(adap);
sda=getsda(adap); sda = getsda(adap);
scl=(adap->getscl==NULL?1:getscl(adap)); scl = (adap->getscl == NULL) ? 1 : getscl(adap);
if ( 0 == scl ) { if (!scl) {
printk(KERN_WARNING "%s: SCL stuck low!\n", name); printk(KERN_WARNING "%s: SCL stuck low!\n", name);
goto bailout; goto bailout;
} }
if ( 0 == sda ) { if (!sda) {
printk(KERN_WARNING "%s: SDA unexpected low " printk(KERN_WARNING "%s: SDA unexpected low "
"while pulling SCL high!\n", name); "while pulling SCL high!\n", name);
goto bailout; goto bailout;
@ -314,9 +320,10 @@ static int try_address(struct i2c_adapter *i2c_adap,
unsigned char addr, int retries) unsigned char addr, int retries)
{ {
struct i2c_algo_bit_data *adap = i2c_adap->algo_data; struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
int i,ret = -1; int i, ret = -1;
for (i=0;i<=retries;i++) {
ret = i2c_outb(i2c_adap,addr); for (i = 0; i <= retries; i++) {
ret = i2c_outb(i2c_adap, addr);
if (ret == 1 || i == retries) if (ret == 1 || i == retries)
break; break;
bit_dbg(3, &i2c_adap->dev, "emitting stop condition\n"); bit_dbg(3, &i2c_adap->dev, "emitting stop condition\n");
@ -338,14 +345,16 @@ static int sendbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
{ {
const unsigned char *temp = msg->buf; const unsigned char *temp = msg->buf;
int count = msg->len; int count = msg->len;
unsigned short nak_ok = msg->flags & I2C_M_IGNORE_NAK; unsigned short nak_ok = msg->flags & I2C_M_IGNORE_NAK;
int retval; int retval;
int wrcount=0; int wrcount = 0;
while (count > 0) { while (count > 0) {
retval = i2c_outb(i2c_adap, *temp); retval = i2c_outb(i2c_adap, *temp);
if ((retval>0) || (nak_ok && (retval==0))) { /* ok or ignored NAK */
count--; /* OK/ACK; or ignored NAK */
if ((retval > 0) || (nak_ok && (retval == 0))) {
count--;
temp++; temp++;
wrcount++; wrcount++;
} else { /* arbitration or no acknowledge */ } else { /* arbitration or no acknowledge */
@ -376,14 +385,14 @@ static int acknak(struct i2c_adapter *i2c_adap, int is_ack)
static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg) static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
{ {
int inval; int inval;
int rdcount=0; /* counts bytes read */ int rdcount = 0; /* counts bytes read */
unsigned char *temp = msg->buf; unsigned char *temp = msg->buf;
int count = msg->len; int count = msg->len;
const unsigned flags = msg->flags; const unsigned flags = msg->flags;
while (count > 0) { while (count > 0) {
inval = i2c_inb(i2c_adap); inval = i2c_inb(i2c_adap);
if (inval>=0) { if (inval >= 0) {
*temp = inval; *temp = inval;
rdcount++; rdcount++;
} else { /* read timed out */ } else { /* read timed out */
@ -431,7 +440,7 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
* returns: * returns:
* 0 everything went okay, the chip ack'ed, or IGNORE_NAK flag was set * 0 everything went okay, the chip ack'ed, or IGNORE_NAK flag was set
* -x an error occurred (like: -EREMOTEIO if the device did not answer, or * -x an error occurred (like: -EREMOTEIO if the device did not answer, or
* -ETIMEDOUT, for example if the lines are stuck...) * -ETIMEDOUT, for example if the lines are stuck...)
*/ */
static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg) static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
{ {
@ -443,10 +452,10 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
int ret, retries; int ret, retries;
retries = nak_ok ? 0 : i2c_adap->retries; retries = nak_ok ? 0 : i2c_adap->retries;
if ( (flags & I2C_M_TEN) ) { if (flags & I2C_M_TEN) {
/* a ten bit address */ /* a ten bit address */
addr = 0xf0 | (( msg->addr >> 7) & 0x03); addr = 0xf0 | ((msg->addr >> 7) & 0x03);
bit_dbg(2, &i2c_adap->dev, "addr0: %d\n", addr); bit_dbg(2, &i2c_adap->dev, "addr0: %d\n", addr);
/* try extended address code...*/ /* try extended address code...*/
ret = try_address(i2c_adap, addr, retries); ret = try_address(i2c_adap, addr, retries);
@ -456,33 +465,33 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
return -EREMOTEIO; return -EREMOTEIO;
} }
/* the remaining 8 bit address */ /* the remaining 8 bit address */
ret = i2c_outb(i2c_adap,msg->addr & 0x7f); ret = i2c_outb(i2c_adap, msg->addr & 0x7f);
if ((ret != 1) && !nak_ok) { if ((ret != 1) && !nak_ok) {
/* the chip did not ack / xmission error occurred */ /* the chip did not ack / xmission error occurred */
dev_err(&i2c_adap->dev, "died at 2nd address code\n"); dev_err(&i2c_adap->dev, "died at 2nd address code\n");
return -EREMOTEIO; return -EREMOTEIO;
} }
if ( flags & I2C_M_RD ) { if (flags & I2C_M_RD) {
bit_dbg(3, &i2c_adap->dev, "emitting repeated " bit_dbg(3, &i2c_adap->dev, "emitting repeated "
"start condition\n"); "start condition\n");
i2c_repstart(adap); i2c_repstart(adap);
/* okay, now switch into reading mode */ /* okay, now switch into reading mode */
addr |= 0x01; addr |= 0x01;
ret = try_address(i2c_adap, addr, retries); ret = try_address(i2c_adap, addr, retries);
if ((ret!=1) && !nak_ok) { if ((ret != 1) && !nak_ok) {
dev_err(&i2c_adap->dev, dev_err(&i2c_adap->dev,
"died at repeated address code\n"); "died at repeated address code\n");
return -EREMOTEIO; return -EREMOTEIO;
} }
} }
} else { /* normal 7bit address */ } else { /* normal 7bit address */
addr = ( msg->addr << 1 ); addr = msg->addr << 1;
if (flags & I2C_M_RD ) if (flags & I2C_M_RD)
addr |= 1; addr |= 1;
if (flags & I2C_M_REV_DIR_ADDR ) if (flags & I2C_M_REV_DIR_ADDR)
addr ^= 1; addr ^= 1;
ret = try_address(i2c_adap, addr, retries); ret = try_address(i2c_adap, addr, retries);
if ((ret!=1) && !nak_ok) if ((ret != 1) && !nak_ok)
return -EREMOTEIO; return -EREMOTEIO;
} }
@ -494,15 +503,14 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
{ {
struct i2c_msg *pmsg; struct i2c_msg *pmsg;
struct i2c_algo_bit_data *adap = i2c_adap->algo_data; struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
int i, ret;
int i,ret;
unsigned short nak_ok; unsigned short nak_ok;
bit_dbg(3, &i2c_adap->dev, "emitting start condition\n"); bit_dbg(3, &i2c_adap->dev, "emitting start condition\n");
i2c_start(adap); i2c_start(adap);
for (i=0;i<num;i++) { for (i = 0; i < num; i++) {
pmsg = &msgs[i]; pmsg = &msgs[i];
nak_ok = pmsg->flags & I2C_M_IGNORE_NAK; nak_ok = pmsg->flags & I2C_M_IGNORE_NAK;
if (!(pmsg->flags & I2C_M_NOSTART)) { if (!(pmsg->flags & I2C_M_NOSTART)) {
if (i) { if (i) {
bit_dbg(3, &i2c_adap->dev, "emitting " bit_dbg(3, &i2c_adap->dev, "emitting "
@ -517,7 +525,7 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
goto bailout; goto bailout;
} }
} }
if (pmsg->flags & I2C_M_RD ) { if (pmsg->flags & I2C_M_RD) {
/* read bytes into buffer*/ /* read bytes into buffer*/
ret = readbytes(i2c_adap, pmsg); ret = readbytes(i2c_adap, pmsg);
if (ret >= 1) if (ret >= 1)
@ -551,7 +559,7 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
static u32 bit_func(struct i2c_adapter *adap) static u32 bit_func(struct i2c_adapter *adap)
{ {
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL |
I2C_FUNC_SMBUS_READ_BLOCK_DATA | I2C_FUNC_SMBUS_READ_BLOCK_DATA |
I2C_FUNC_SMBUS_BLOCK_PROC_CALL | I2C_FUNC_SMBUS_BLOCK_PROC_CALL |
I2C_FUNC_10BIT_ADDR | I2C_FUNC_PROTOCOL_MANGLING; I2C_FUNC_10BIT_ADDR | I2C_FUNC_PROTOCOL_MANGLING;
@ -565,8 +573,8 @@ static const struct i2c_algorithm i2c_bit_algo = {
.functionality = bit_func, .functionality = bit_func,
}; };
/* /*
* registering functions to load algorithms at runtime * registering functions to load algorithms at runtime
*/ */
static int i2c_bit_prepare_bus(struct i2c_adapter *adap) static int i2c_bit_prepare_bus(struct i2c_adapter *adap)
{ {
@ -574,7 +582,7 @@ static int i2c_bit_prepare_bus(struct i2c_adapter *adap)
if (bit_test) { if (bit_test) {
int ret = test_bus(bit_adap, adap->name); int ret = test_bus(bit_adap, adap->name);
if (ret<0) if (ret < 0)
return -ENODEV; return -ENODEV;
} }