diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-06-23 16:18:08 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-07-11 17:10:36 -0400 |
commit | 541e6a02768404efb06bd1ea5f33d614732f41fc (patch) | |
tree | 933f4e7b38580c69e61b8a0002d4e5c129c5abaa | |
parent | 65fc50e50ff9f8b82c3756eccd7e7db6a267ffe9 (diff) |
[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: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/i2c/algos/i2c-algo-ite.c | 8 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-i801.c | 4 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-piix4.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-sis5595.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c index 68e9e6832ca0..e6cae39f47aa 100644 --- a/drivers/i2c/algos/i2c-algo-ite.c +++ b/drivers/i2c/algos/i2c-algo-ite.c | |||
@@ -208,7 +208,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) { | |||
208 | goto bailout; | 208 | goto bailout; |
209 | } | 209 | } |
210 | sdalo(adap); | 210 | sdalo(adap); |
211 | printk("test_bus:1 scl: %d sda: %d \n",getscl(adap), | 211 | printk("test_bus:1 scl: %d sda: %d\n", getscl(adap), |
212 | getsda(adap)); | 212 | getsda(adap)); |
213 | if ( 0 != getsda(adap) ) { | 213 | if ( 0 != getsda(adap) ) { |
214 | printk("test_bus: %s SDA stuck high!\n",name); | 214 | 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 | goto bailout; | 221 | goto bailout; |
222 | } | 222 | } |
223 | sdahi(adap); | 223 | sdahi(adap); |
224 | printk("test_bus:2 scl: %d sda: %d \n",getscl(adap), | 224 | printk("test_bus:2 scl: %d sda: %d\n", getscl(adap), |
225 | getsda(adap)); | 225 | getsda(adap)); |
226 | if ( 0 == getsda(adap) ) { | 226 | if ( 0 == getsda(adap) ) { |
227 | printk("test_bus: %s SDA stuck low!\n",name); | 227 | 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 | goto bailout; | 234 | goto bailout; |
235 | } | 235 | } |
236 | scllo(adap); | 236 | scllo(adap); |
237 | printk("test_bus:3 scl: %d sda: %d \n",getscl(adap), | 237 | printk("test_bus:3 scl: %d sda: %d\n", getscl(adap), |
238 | getsda(adap)); | 238 | getsda(adap)); |
239 | if ( 0 != getscl(adap) ) { | 239 | if ( 0 != getscl(adap) ) { |
240 | 240 | ||
@@ -247,7 +247,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) { | |||
247 | goto bailout; | 247 | goto bailout; |
248 | } | 248 | } |
249 | sclhi(adap); | 249 | sclhi(adap); |
250 | printk("test_bus:4 scl: %d sda: %d \n",getscl(adap), | 250 | printk("test_bus:4 scl: %d sda: %d\n", getscl(adap), |
251 | getsda(adap)); | 251 | getsda(adap)); |
252 | if ( 0 == getscl(adap) ) { | 252 | if ( 0 == getscl(adap) ) { |
253 | printk("test_bus: %s SCL stuck low!\n",name); | 253 | printk("test_bus: %s SCL stuck low!\n",name); |
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 45e6efb1dcd1..0ab7e37f5b00 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c | |||
@@ -194,7 +194,7 @@ static int i801_transaction(void) | |||
194 | /* Make sure the SMBus host is ready to start transmitting */ | 194 | /* Make sure the SMBus host is ready to start transmitting */ |
195 | /* 0x1f = Failed, Bus_Err, Dev_Err, Intr, Host_Busy */ | 195 | /* 0x1f = Failed, Bus_Err, Dev_Err, Intr, Host_Busy */ |
196 | if ((temp = (0x1f & inb_p(SMBHSTSTS))) != 0x00) { | 196 | if ((temp = (0x1f & inb_p(SMBHSTSTS))) != 0x00) { |
197 | dev_dbg(&I801_dev->dev, "SMBus busy (%02x). Resetting... \n", | 197 | dev_dbg(&I801_dev->dev, "SMBus busy (%02x). Resetting...\n", |
198 | temp); | 198 | temp); |
199 | outb_p(temp, SMBHSTSTS); | 199 | outb_p(temp, SMBHSTSTS); |
200 | if ((temp = (0x1f & inb_p(SMBHSTSTS))) != 0x00) { | 200 | 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 | } | 315 | } |
316 | if (temp & errmask) { | 316 | if (temp & errmask) { |
317 | dev_dbg(&I801_dev->dev, "SMBus busy (%02x). " | 317 | dev_dbg(&I801_dev->dev, "SMBus busy (%02x). " |
318 | "Resetting... \n", temp); | 318 | "Resetting...\n", temp); |
319 | outb_p(temp, SMBHSTSTS); | 319 | outb_p(temp, SMBHSTSTS); |
320 | if (((temp = inb_p(SMBHSTSTS)) & errmask) != 0x00) { | 320 | if (((temp = inb_p(SMBHSTSTS)) & errmask) != 0x00) { |
321 | dev_err(&I801_dev->dev, | 321 | dev_err(&I801_dev->dev, |
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 1f80ba9da6f1..6d34ee381ce1 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c | |||
@@ -243,7 +243,7 @@ static int piix4_transaction(void) | |||
243 | /* Make sure the SMBus host is ready to start transmitting */ | 243 | /* Make sure the SMBus host is ready to start transmitting */ |
244 | if ((temp = inb_p(SMBHSTSTS)) != 0x00) { | 244 | if ((temp = inb_p(SMBHSTSTS)) != 0x00) { |
245 | dev_dbg(&piix4_adapter.dev, "SMBus busy (%02x). " | 245 | dev_dbg(&piix4_adapter.dev, "SMBus busy (%02x). " |
246 | "Resetting... \n", temp); | 246 | "Resetting...\n", temp); |
247 | outb_p(temp, SMBHSTSTS); | 247 | outb_p(temp, SMBHSTSTS); |
248 | if ((temp = inb_p(SMBHSTSTS)) != 0x00) { | 248 | if ((temp = inb_p(SMBHSTSTS)) != 0x00) { |
249 | dev_err(&piix4_adapter.dev, "Failed! (%02x)\n", temp); | 249 | dev_err(&piix4_adapter.dev, "Failed! (%02x)\n", temp); |
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c index 2b5911cfb7b5..bbd5e4e52f09 100644 --- a/drivers/i2c/busses/i2c-sis5595.c +++ b/drivers/i2c/busses/i2c-sis5595.c | |||
@@ -228,7 +228,7 @@ static int sis5595_transaction(struct i2c_adapter *adap) | |||
228 | /* Make sure the SMBus host is ready to start transmitting */ | 228 | /* Make sure the SMBus host is ready to start transmitting */ |
229 | temp = sis5595_read(SMB_STS_LO) + (sis5595_read(SMB_STS_HI) << 8); | 229 | temp = sis5595_read(SMB_STS_LO) + (sis5595_read(SMB_STS_HI) << 8); |
230 | if (temp != 0x00) { | 230 | if (temp != 0x00) { |
231 | dev_dbg(&adap->dev, "SMBus busy (%04x). Resetting... \n", temp); | 231 | dev_dbg(&adap->dev, "SMBus busy (%04x). Resetting...\n", temp); |
232 | sis5595_write(SMB_STS_LO, temp & 0xff); | 232 | sis5595_write(SMB_STS_LO, temp & 0xff); |
233 | sis5595_write(SMB_STS_HI, temp >> 8); | 233 | sis5595_write(SMB_STS_HI, temp >> 8); |
234 | if ((temp = sis5595_read(SMB_STS_LO) + (sis5595_read(SMB_STS_HI) << 8)) != 0x00) { | 234 | if ((temp = sis5595_read(SMB_STS_LO) + (sis5595_read(SMB_STS_HI) << 8)) != 0x00) { |