Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27fe048e authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[PATCH] hwmon: kill client name lm78-j 



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: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e647ecf1

Documentation/hwmon/lm78

+1 −6
Original line number Diff line number Diff line
@@ -2,16 +2,11 @@ Kernel driver lm78 
==================



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
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 
static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };



/* Insmod parameters */

SENSORS_INSMOD_3(lm78, lm78j, lm79);

SENSORS_INSMOD_2(lm78, lm79);



/* Many LM78 constants specified below */
@@ -559,10 +559,9 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind) 
	/* 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 {
@@ -578,8 +577,6 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind) 


	if (kind == lm78) {

		client_name = "lm78";

	} else if (kind == lm78j) {

		client_name = "lm78-j";

	} else if (kind == lm79) {

		client_name = "lm79";

	}
@@ -788,7 +785,7 @@ static void __exit sm_lm78_exit(void) 




MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>");

MODULE_DESCRIPTION("LM78, LM78-J and LM79 driver");

MODULE_DESCRIPTION("LM78/LM79 driver");

MODULE_LICENSE("GPL");



module_init(sm_lm78_init);