Commit 3d438291 authored by Wolfram Sang's avatar Wolfram Sang Committed by Jean Delvare

i2c-algo-pca: Remove trailing whitespaces and unnecessary UTF

Remove trailing whitespaces to make further patches more readable.  Also remove
an unnecessary UTF-char for simplicity ("us" for microseconds is fine enough).
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 3845de25
/* /*
* i2c-algo-pca.c i2c driver algorithms for PCA9564 adapters * i2c-algo-pca.c i2c driver algorithms for PCA9564 adapters
* Copyright (C) 2004 Arcom Control Systems * Copyright (C) 2004 Arcom Control Systems
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -99,7 +99,7 @@ static void pca_stop(struct i2c_algo_pca_data *adap) ...@@ -99,7 +99,7 @@ static void pca_stop(struct i2c_algo_pca_data *adap)
* *
* returns after the address has been sent * returns after the address has been sent
*/ */
static void pca_address(struct i2c_algo_pca_data *adap, static void pca_address(struct i2c_algo_pca_data *adap,
struct i2c_msg *msg) struct i2c_msg *msg)
{ {
int sta = pca_get_con(adap); int sta = pca_get_con(adap);
...@@ -108,9 +108,9 @@ static void pca_address(struct i2c_algo_pca_data *adap, ...@@ -108,9 +108,9 @@ static void pca_address(struct i2c_algo_pca_data *adap,
addr = ( (0x7f & msg->addr) << 1 ); addr = ( (0x7f & msg->addr) << 1 );
if (msg->flags & I2C_M_RD ) if (msg->flags & I2C_M_RD )
addr |= 1; addr |= 1;
DEB2("=== SLAVE ADDRESS %#04x+%c=%#04x\n", DEB2("=== SLAVE ADDRESS %#04x+%c=%#04x\n",
msg->addr, msg->flags & I2C_M_RD ? 'R' : 'W', addr); msg->addr, msg->flags & I2C_M_RD ? 'R' : 'W', addr);
pca_outw(adap, I2C_PCA_DAT, addr); pca_outw(adap, I2C_PCA_DAT, addr);
sta &= ~(I2C_PCA_CON_STO|I2C_PCA_CON_STA|I2C_PCA_CON_SI); sta &= ~(I2C_PCA_CON_STO|I2C_PCA_CON_STA|I2C_PCA_CON_SI);
...@@ -124,7 +124,7 @@ static void pca_address(struct i2c_algo_pca_data *adap, ...@@ -124,7 +124,7 @@ static void pca_address(struct i2c_algo_pca_data *adap,
* *
* Returns after the byte has been transmitted * Returns after the byte has been transmitted
*/ */
static void pca_tx_byte(struct i2c_algo_pca_data *adap, static void pca_tx_byte(struct i2c_algo_pca_data *adap,
__u8 b) __u8 b)
{ {
int sta = pca_get_con(adap); int sta = pca_get_con(adap);
...@@ -142,19 +142,19 @@ static void pca_tx_byte(struct i2c_algo_pca_data *adap, ...@@ -142,19 +142,19 @@ static void pca_tx_byte(struct i2c_algo_pca_data *adap,
* *
* returns immediately. * returns immediately.
*/ */
static void pca_rx_byte(struct i2c_algo_pca_data *adap, static void pca_rx_byte(struct i2c_algo_pca_data *adap,
__u8 *b, int ack) __u8 *b, int ack)
{ {
*b = pca_inw(adap, I2C_PCA_DAT); *b = pca_inw(adap, I2C_PCA_DAT);
DEB2("=== READ %#04x %s\n", *b, ack ? "ACK" : "NACK"); DEB2("=== READ %#04x %s\n", *b, ack ? "ACK" : "NACK");
} }
/* /*
* Setup ACK or NACK for next received byte and wait for it to arrive. * Setup ACK or NACK for next received byte and wait for it to arrive.
* *
* Returns after next byte has arrived. * Returns after next byte has arrived.
*/ */
static void pca_rx_ack(struct i2c_algo_pca_data *adap, static void pca_rx_ack(struct i2c_algo_pca_data *adap,
int ack) int ack)
{ {
int sta = pca_get_con(adap); int sta = pca_get_con(adap);
...@@ -168,8 +168,8 @@ static void pca_rx_ack(struct i2c_algo_pca_data *adap, ...@@ -168,8 +168,8 @@ static void pca_rx_ack(struct i2c_algo_pca_data *adap,
pca_wait(adap); pca_wait(adap);
} }
/* /*
* Reset the i2c bus / SIO * Reset the i2c bus / SIO
*/ */
static void pca_reset(struct i2c_algo_pca_data *adap) static void pca_reset(struct i2c_algo_pca_data *adap)
{ {
...@@ -203,14 +203,14 @@ static int pca_xfer(struct i2c_adapter *i2c_adap, ...@@ -203,14 +203,14 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
for (curmsg = 0; curmsg < num; curmsg++) { for (curmsg = 0; curmsg < num; curmsg++) {
int addr, i; int addr, i;
msg = &msgs[curmsg]; msg = &msgs[curmsg];
addr = (0x7f & msg->addr) ; addr = (0x7f & msg->addr) ;
if (msg->flags & I2C_M_RD ) if (msg->flags & I2C_M_RD )
printk(KERN_INFO " [%02d] RD %d bytes from %#02x [%#02x, ...]\n", printk(KERN_INFO " [%02d] RD %d bytes from %#02x [%#02x, ...]\n",
curmsg, msg->len, addr, (addr<<1) | 1); curmsg, msg->len, addr, (addr<<1) | 1);
else { else {
printk(KERN_INFO " [%02d] WR %d bytes to %#02x [%#02x%s", printk(KERN_INFO " [%02d] WR %d bytes to %#02x [%#02x%s",
curmsg, msg->len, addr, addr<<1, curmsg, msg->len, addr, addr<<1,
msg->len == 0 ? "" : ", "); msg->len == 0 ? "" : ", ");
for(i=0; i < msg->len; i++) for(i=0; i < msg->len; i++)
...@@ -237,7 +237,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap, ...@@ -237,7 +237,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
case 0x10: /* A repeated start condition has been transmitted */ case 0x10: /* A repeated start condition has been transmitted */
pca_address(adap, msg); pca_address(adap, msg);
break; break;
case 0x18: /* SLA+W has been transmitted; ACK has been received */ case 0x18: /* SLA+W has been transmitted; ACK has been received */
case 0x28: /* Data byte in I2CDAT has been transmitted; ACK has been received */ case 0x28: /* Data byte in I2CDAT has been transmitted; ACK has been received */
if (numbytes < msg->len) { if (numbytes < msg->len) {
...@@ -287,7 +287,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap, ...@@ -287,7 +287,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
case 0x38: /* Arbitration lost during SLA+W, SLA+R or data bytes */ case 0x38: /* Arbitration lost during SLA+W, SLA+R or data bytes */
DEB2("Arbitration lost\n"); DEB2("Arbitration lost\n");
goto out; goto out;
case 0x58: /* Data byte has been received; NOT ACK has been returned */ case 0x58: /* Data byte has been received; NOT ACK has been returned */
if ( numbytes == msg->len - 1 ) { if ( numbytes == msg->len - 1 ) {
pca_rx_byte(adap, &msg->buf[numbytes], 0); pca_rx_byte(adap, &msg->buf[numbytes], 0);
...@@ -320,13 +320,13 @@ static int pca_xfer(struct i2c_adapter *i2c_adap, ...@@ -320,13 +320,13 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
printk(KERN_ERR DRIVER ": unhandled SIO state 0x%02x\n", state); printk(KERN_ERR DRIVER ": unhandled SIO state 0x%02x\n", state);
break; break;
} }
} }
ret = curmsg; ret = curmsg;
out: out:
DEB1(KERN_CRIT "}}} transfered %d/%d messages. " DEB1(KERN_CRIT "}}} transfered %d/%d messages. "
"status is %#04x. control is %#04x\n", "status is %#04x. control is %#04x\n",
curmsg, num, pca_status(adap), curmsg, num, pca_status(adap),
pca_get_con(adap)); pca_get_con(adap));
return ret; return ret;
...@@ -350,7 +350,7 @@ static int pca_init(struct i2c_algo_pca_data *adap) ...@@ -350,7 +350,7 @@ static int pca_init(struct i2c_algo_pca_data *adap)
pca_outw(adap, I2C_PCA_ADR, own << 1); pca_outw(adap, I2C_PCA_ADR, own << 1);
pca_set_con(adap, I2C_PCA_CON_ENSIO | clock); pca_set_con(adap, I2C_PCA_CON_ENSIO | clock);
udelay(500); /* 500 µs for oscilator to stabilise */ udelay(500); /* 500 us for oscilator to stabilise */
return 0; return 0;
} }
...@@ -360,8 +360,8 @@ static const struct i2c_algorithm pca_algo = { ...@@ -360,8 +360,8 @@ static const struct i2c_algorithm pca_algo = {
.functionality = pca_func, .functionality = pca_func,
}; };
/* /*
* registering functions to load algorithms at runtime * registering functions to load algorithms at runtime
*/ */
int i2c_pca_add_bus(struct i2c_adapter *adap) int i2c_pca_add_bus(struct i2c_adapter *adap)
{ {
......
...@@ -78,7 +78,7 @@ pca_isa_readbyte(struct i2c_algo_pca_data *adap, int reg) ...@@ -78,7 +78,7 @@ pca_isa_readbyte(struct i2c_algo_pca_data *adap, int reg)
int res = inb(base+reg); int res = inb(base+reg);
#ifdef DEBUG_IO #ifdef DEBUG_IO
{ {
static char *names[] = { "STA", "DAT", "ADR", "CON" }; static char *names[] = { "STA", "DAT", "ADR", "CON" };
printk("*** read %s => %#04x\n", names[reg], res); printk("*** read %s => %#04x\n", names[reg], res);
} }
#endif #endif
...@@ -93,7 +93,7 @@ static int pca_isa_waitforinterrupt(struct i2c_algo_pca_data *adap) ...@@ -93,7 +93,7 @@ static int pca_isa_waitforinterrupt(struct i2c_algo_pca_data *adap)
ret = wait_event_interruptible(pca_wait, ret = wait_event_interruptible(pca_wait,
pca_isa_readbyte(adap, I2C_PCA_CON) & I2C_PCA_CON_SI); pca_isa_readbyte(adap, I2C_PCA_CON) & I2C_PCA_CON_SI);
} else { } else {
while ((pca_isa_readbyte(adap, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0) while ((pca_isa_readbyte(adap, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0)
udelay(100); udelay(100);
} }
return ret; return ret;
......
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