This is a note to let you know that I've just added the patch titled
Subject: I2C: Missing space in split strings
to my gregkh-2.6 tree. Its filename is
i2c-missing-space.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
Patches currently in gregkh-2.6 which might be from khali at linux-fr.org are
i2c/i2c-max6875-documentation-update.patch
i2c/i2c-max6875-simplify.patch
i2c/i2c-hwmon-class-01.patch
i2c/i2c-hwmon-class-02.patch
i2c/i2c-hwmon-class-03.patch
i2c/i2c-missing-space.patch
>From khali at linux-fr.org Fri Jul 15 00:18:04 2005
Date: Fri, 15 Jul 2005 08:53:05 +0200
From: Jean Delvare <khali at linux-fr.org>
To: Greg KH <greg at kroah.com>
Cc: LM Sensors <lm-sensors at lm-sensors.org>
Subject: I2C: Missing space in split strings
Message-Id: <20050715085305.4dc8c732.khali at linux-fr.org>
A few split string in i2c (and now hwmon) drivers lack a joining space,
causing them to display incorrectly. This trivial patch fixes that up.
Please apply, thanks.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/hwmon/adm1026.c | 2 +-
drivers/hwmon/max1619.c | 2 +-
drivers/hwmon/pc87360.c | 2 +-
drivers/i2c/busses/i2c-i801.c | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
--- gregkh-2.6.orig/drivers/hwmon/pc87360.c 2005-07-13 09:45:05.000000000 -0700
+++ gregkh-2.6/drivers/hwmon/pc87360.c 2005-07-26 14:53:45.000000000 -0700
@@ -1043,7 +1043,7 @@
if (init >= 2 && data->innr) {
reg = pc87360_read_value(data, LD_IN, NO_BANK,
PC87365_REG_IN_CONVRATE);
- dev_info(&client->dev, "VLM conversion set to"
+ dev_info(&client->dev, "VLM conversion set to "
"1s period, 160us delay\n");
pc87360_write_value(data, LD_IN, NO_BANK,
PC87365_REG_IN_CONVRATE,
--- gregkh-2.6.orig/drivers/i2c/busses/i2c-i801.c 2005-07-13 09:45:05.000000000 -0700
+++ gregkh-2.6/drivers/i2c/busses/i2c-i801.c 2005-07-26 14:53:45.000000000 -0700
@@ -137,7 +137,7 @@
pci_read_config_word(I801_dev, SMBBA, &i801_smba);
i801_smba &= 0xfff0;
if(i801_smba == 0) {
- dev_err(&dev->dev, "SMB base address uninitialized"
+ dev_err(&dev->dev, "SMB base address uninitialized "
"- upgrade BIOS or use force_addr=0xaddr\n");
return -ENODEV;
}
@@ -186,7 +186,7 @@
int result = 0;
int timeout = 0;
- dev_dbg(&I801_dev->dev, "Transaction (pre): CNT=%02x, CMD=%02x,"
+ dev_dbg(&I801_dev->dev, "Transaction (pre): CNT=%02x, CMD=%02x, "
"ADD=%02x, DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTCNT),
inb_p(SMBHSTCMD), inb_p(SMBHSTADD), inb_p(SMBHSTDAT0),
inb_p(SMBHSTDAT1));
@@ -240,7 +240,7 @@
outb_p(inb(SMBHSTSTS), SMBHSTSTS);
if ((temp = (0x1f & inb_p(SMBHSTSTS))) != 0x00) {
- dev_dbg(&I801_dev->dev, "Failed reset at end of transaction"
+ dev_dbg(&I801_dev->dev, "Failed reset at end of transaction "
"(%02x)\n", temp);
}
dev_dbg(&I801_dev->dev, "Transaction (post): CNT=%02x, CMD=%02x, "
--- gregkh-2.6.orig/drivers/hwmon/adm1026.c 2005-07-13 09:45:05.000000000 -0700
+++ gregkh-2.6/drivers/hwmon/adm1026.c 2005-07-26 14:53:45.000000000 -0700
@@ -393,7 +393,7 @@
value = data->config3;
if (data->config3 & CFG3_GPIO16_ENABLE) {
- dev_dbg(&client->dev, "GPIO16 enabled. THERM"
+ dev_dbg(&client->dev, "GPIO16 enabled. THERM "
"pin disabled.\n");
} else {
dev_dbg(&client->dev, "THERM pin enabled. "
--- gregkh-2.6.orig/drivers/hwmon/max1619.c 2005-07-13 09:45:05.000000000 -0700
+++ gregkh-2.6/drivers/hwmon/max1619.c 2005-07-26 14:53:45.000000000 -0700
@@ -363,7 +363,7 @@
i2c_del_driver(&max1619_driver);
}
-MODULE_AUTHOR("Alexey Fisher <fishor at mail.ru> and"
+MODULE_AUTHOR("Alexey Fisher <fishor at mail.ru> and "
"Jean Delvare <khali at linux-fr.org>");
MODULE_DESCRIPTION("MAX1619 sensor driver");
MODULE_LICENSE("GPL");
