提交 541e6a02 编写于 作者: J Jean Delvare 提交者: Greg Kroah-Hartman

[PATCH] I2C: Strip trailing whitespace from strings

Here is a simple patch originally from Denis Vlasenko, which strips a
useless trailing whitespace from 8 strings in 4 i2c drivers. Please
apply, thanks.

From: Denis Vlasenko <vda@ilport.com.ua>
Signed-off-by: NJean Delvare <khali@linux-fr.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 65fc50e5
...@@ -208,7 +208,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) { ...@@ -208,7 +208,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) {
goto bailout; goto bailout;
} }
sdalo(adap); sdalo(adap);
printk("test_bus:1 scl: %d sda: %d \n",getscl(adap), printk("test_bus:1 scl: %d sda: %d\n", getscl(adap),
getsda(adap)); getsda(adap));
if ( 0 != getsda(adap) ) { if ( 0 != getsda(adap) ) {
printk("test_bus: %s SDA stuck high!\n",name); printk("test_bus: %s SDA stuck high!\n",name);
...@@ -221,7 +221,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) { ...@@ -221,7 +221,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) {
goto bailout; goto bailout;
} }
sdahi(adap); sdahi(adap);
printk("test_bus:2 scl: %d sda: %d \n",getscl(adap), printk("test_bus:2 scl: %d sda: %d\n", getscl(adap),
getsda(adap)); getsda(adap));
if ( 0 == getsda(adap) ) { if ( 0 == getsda(adap) ) {
printk("test_bus: %s SDA stuck low!\n",name); printk("test_bus: %s SDA stuck low!\n",name);
...@@ -234,7 +234,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) { ...@@ -234,7 +234,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) {
goto bailout; goto bailout;
} }
scllo(adap); scllo(adap);
printk("test_bus:3 scl: %d sda: %d \n",getscl(adap), printk("test_bus:3 scl: %d sda: %d\n", getscl(adap),
getsda(adap)); getsda(adap));
if ( 0 != getscl(adap) ) { if ( 0 != getscl(adap) ) {
...@@ -247,7 +247,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) { ...@@ -247,7 +247,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) {
goto bailout; goto bailout;
} }
sclhi(adap); sclhi(adap);
printk("test_bus:4 scl: %d sda: %d \n",getscl(adap), printk("test_bus:4 scl: %d sda: %d\n", getscl(adap),
getsda(adap)); getsda(adap));
if ( 0 == getscl(adap) ) { if ( 0 == getscl(adap) ) {
printk("test_bus: %s SCL stuck low!\n",name); printk("test_bus: %s SCL stuck low!\n",name);
......
...@@ -194,7 +194,7 @@ static int i801_transaction(void) ...@@ -194,7 +194,7 @@ static int i801_transaction(void)
/* Make sure the SMBus host is ready to start transmitting */ /* Make sure the SMBus host is ready to start transmitting */
/* 0x1f = Failed, Bus_Err, Dev_Err, Intr, Host_Busy */ /* 0x1f = Failed, Bus_Err, Dev_Err, Intr, Host_Busy */
if ((temp = (0x1f & inb_p(SMBHSTSTS))) != 0x00) { if ((temp = (0x1f & inb_p(SMBHSTSTS))) != 0x00) {
dev_dbg(&I801_dev->dev, "SMBus busy (%02x). Resetting... \n", dev_dbg(&I801_dev->dev, "SMBus busy (%02x). Resetting...\n",
temp); temp);
outb_p(temp, SMBHSTSTS); outb_p(temp, SMBHSTSTS);
if ((temp = (0x1f & inb_p(SMBHSTSTS))) != 0x00) { if ((temp = (0x1f & inb_p(SMBHSTSTS))) != 0x00) {
...@@ -315,7 +315,7 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write, ...@@ -315,7 +315,7 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write,
} }
if (temp & errmask) { if (temp & errmask) {
dev_dbg(&I801_dev->dev, "SMBus busy (%02x). " dev_dbg(&I801_dev->dev, "SMBus busy (%02x). "
"Resetting... \n", temp); "Resetting...\n", temp);
outb_p(temp, SMBHSTSTS); outb_p(temp, SMBHSTSTS);
if (((temp = inb_p(SMBHSTSTS)) & errmask) != 0x00) { if (((temp = inb_p(SMBHSTSTS)) & errmask) != 0x00) {
dev_err(&I801_dev->dev, dev_err(&I801_dev->dev,
......
...@@ -243,7 +243,7 @@ static int piix4_transaction(void) ...@@ -243,7 +243,7 @@ static int piix4_transaction(void)
/* Make sure the SMBus host is ready to start transmitting */ /* Make sure the SMBus host is ready to start transmitting */
if ((temp = inb_p(SMBHSTSTS)) != 0x00) { if ((temp = inb_p(SMBHSTSTS)) != 0x00) {
dev_dbg(&piix4_adapter.dev, "SMBus busy (%02x). " dev_dbg(&piix4_adapter.dev, "SMBus busy (%02x). "
"Resetting... \n", temp); "Resetting...\n", temp);
outb_p(temp, SMBHSTSTS); outb_p(temp, SMBHSTSTS);
if ((temp = inb_p(SMBHSTSTS)) != 0x00) { if ((temp = inb_p(SMBHSTSTS)) != 0x00) {
dev_err(&piix4_adapter.dev, "Failed! (%02x)\n", temp); dev_err(&piix4_adapter.dev, "Failed! (%02x)\n", temp);
......
...@@ -228,7 +228,7 @@ static int sis5595_transaction(struct i2c_adapter *adap) ...@@ -228,7 +228,7 @@ static int sis5595_transaction(struct i2c_adapter *adap)
/* Make sure the SMBus host is ready to start transmitting */ /* Make sure the SMBus host is ready to start transmitting */
temp = sis5595_read(SMB_STS_LO) + (sis5595_read(SMB_STS_HI) << 8); temp = sis5595_read(SMB_STS_LO) + (sis5595_read(SMB_STS_HI) << 8);
if (temp != 0x00) { if (temp != 0x00) {
dev_dbg(&adap->dev, "SMBus busy (%04x). Resetting... \n", temp); dev_dbg(&adap->dev, "SMBus busy (%04x). Resetting...\n", temp);
sis5595_write(SMB_STS_LO, temp & 0xff); sis5595_write(SMB_STS_LO, temp & 0xff);
sis5595_write(SMB_STS_HI, temp >> 8); sis5595_write(SMB_STS_HI, temp >> 8);
if ((temp = sis5595_read(SMB_STS_LO) + (sis5595_read(SMB_STS_HI) << 8)) != 0x00) { if ((temp = sis5595_read(SMB_STS_LO) + (sis5595_read(SMB_STS_HI) << 8)) != 0x00) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册