Skip to contentSkip to conversation

hwmon: kill client name lm78-j

PATCH New Jean Delvare 1 participant 1 message Jul 27, 2005

Subsystems (3)
Documentation Hardware monitoring LM78 hardware monitor driver
lore
Share & tools
lore

Jean Delvare

author
#0 lore raw

PATCH 1/1 hwmon: kill client name lm78-j

Hi Greg, all,

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 <[email protected]>
 Documentation/hwmon/lm78 |    7 +------
 drivers/hwmon/lm78.c     |   11 ++++-------
 2 files changed, 5 insertions(+), 13 deletions(-)
Documentation/hwmon/lm78 +1 -6
@@ -2,16 +2,11 @@
 =========
 
 Supported chips:
-  * National Semiconductor LM78
+  * National Semiconductor LM78 / LM78-J
     Prefix: 'lm78'
     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 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
     Prefix: 'lm79'
     Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
drivers/hwmon/lm78.c +4 -7
@@ -37,7 +37,7 @@
 static unsigned short isa_address = 0x290;
 
 /* Insmod parameters */
-SENSORS_INSMOD_3(lm78, lm78j, lm79);
+SENSORS_INSMOD_2(lm78, lm79);
 
 /* Many LM78 constants specified below */
 

@@ -578,10 +578,9 @@
 	/* Determine the chip type. */
 	if (kind <= 0) {
 		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;
-		else if (i = 0x40)
-			kind = lm78j;
 		else if ((i & 0xfe) = 0xc0)
 			kind = lm79;
 		else {

@@ -597,8 +596,6 @@
 
 	if (kind = lm78) {
 		client_name = "lm78";
-	} else if (kind = lm78j) {
-		client_name = "lm78-j";
 	} else if (kind = lm79) {
 		client_name = "lm79";
 	}

@@ -831,7 +828,7 @@
 
 
 MODULE_AUTHOR("Frodo Looijaard <[email protected]>");
-MODULE_DESCRIPTION("LM78, LM78-J and LM79 driver");
+MODULE_DESCRIPTION("LM78/LM79 driver");
 MODULE_LICENSE("GPL");
 
 module_init(sm_lm78_init);
Signature · 1 line
Jean Delvare