Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] hwmon: kill client name lm78-j

Browse source 
Drop the separate client name for the LM78-J chip. This is really
only a later revision of the LM78, with almost no difference and
no difference the driver handles in any case.

This was the only client name that had a dash in it, and special care
had to be taken in libsensors because of it. As we plan to write a new
library soon, I'd like to get rid of this exception before we do.

As a nice side effect, it saves 876 bytes in lm78.ko.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jean Delvare 2005-07-27 21:30:16 +02:00 committed by Greg Kroah-Hartman
parent e647ecf15e
commit 27fe048eb3
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Documentation/hwmon/lm78
View file

@ -2,16 +2,11 @@ Kernel driver lm78
================== ==================
Supported chips: Supported chips:
* National Semiconductor LM78 * National Semiconductor LM78 / LM78-J
Prefix: 'lm78' Prefix: 'lm78'
Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports) Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
Datasheet: Publicly available at the National Semiconductor website Datasheet: Publicly available at the National Semiconductor website
http://www.national.com/ http://www.national.com/
* National Semiconductor LM78-J
Prefix: 'lm78-j'
Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
Datasheet: Publicly available at the National Semiconductor website
http://www.national.com/
* National Semiconductor LM79 * National Semiconductor LM79
Prefix: 'lm79' Prefix: 'lm79'
Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports) Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)

11
drivers/hwmon/lm78.c
View file

@ -34,7 +34,7 @@ static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24,
static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
/* Insmod parameters */ /* Insmod parameters */
SENSORS_INSMOD_3(lm78, lm78j, lm79); SENSORS_INSMOD_2(lm78, lm79);
/* Many LM78 constants specified below */ /* Many LM78 constants specified below */
@ -559,10 +559,9 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
/* Determine the chip type. */ /* Determine the chip type. */
if (kind <= 0) { if (kind <= 0) {
i = lm78_read_value(new_client, LM78_REG_CHIPID); i = lm78_read_value(new_client, LM78_REG_CHIPID);
if (i == 0x00 || i == 0x20) if (i == 0x00 || i == 0x20 /* LM78 */
|| i == 0x40) /* LM78-J */
kind = lm78; kind = lm78;
else if (i == 0x40)
kind = lm78j;
else if ((i & 0xfe) == 0xc0) else if ((i & 0xfe) == 0xc0)
kind = lm79; kind = lm79;
else { else {
@ -578,8 +577,6 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
if (kind == lm78) { if (kind == lm78) {
client_name = "lm78"; client_name = "lm78";
} else if (kind == lm78j) {
client_name = "lm78-j";
} else if (kind == lm79) { } else if (kind == lm79) {
client_name = "lm79"; client_name = "lm79";
} }
@ -788,7 +785,7 @@ static void __exit sm_lm78_exit(void)
MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>"); MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>");
MODULE_DESCRIPTION("LM78, LM78-J and LM79 driver"); MODULE_DESCRIPTION("LM78/LM79 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_init(sm_lm78_init); module_init(sm_lm78_init);