Skip to content

Commit

Permalink
[PATCH] i2c-viapro: Refactor control outb
Browse files Browse the repository at this point in the history
By slightly shifting the interface between vt596_access and
vt596_transaction, we can save two I/O accesses per SMBus transaction.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

 drivers/i2c/busses/i2c-viapro.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
  • Loading branch information
Jean Delvare authored and Greg Kroah-Hartman committed Oct 28, 2005
1 parent aaf7f14 commit 50c1cc3
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/i2c/busses/i2c-viapro.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ static struct i2c_adapter vt596_adapter;
static unsigned int vt596_features;

/* Return -1 on error, 0 on success */
static int vt596_transaction(void)
static int vt596_transaction(u8 size)
{
int temp;
int result = 0;
Expand All @@ -131,7 +131,7 @@ static int vt596_transaction(void)
}

/* Start the transaction by setting bit 6 */
outb_p(inb(SMBHSTCNT) | 0x40, SMBHSTCNT);
outb_p(0x40 | (size & 0x3C), SMBHSTCNT);

/* We will always wait for a fraction of a second */
do {
Expand Down Expand Up @@ -232,9 +232,8 @@ static s32 vt596_access(struct i2c_adapter *adap, u16 addr,
}

outb_p(((addr & 0x7f) << 1) | read_write, SMBHSTADD);
outb_p((size & 0x3C), SMBHSTCNT);

if (vt596_transaction()) /* Error in transaction */
if (vt596_transaction(size)) /* Error in transaction */
return -1;

if ((read_write == I2C_SMBUS_WRITE) || (size == VT596_QUICK))
Expand Down

0 comments on commit 50c1cc3

Please sign in to comment.