Skip to contentSkip to conversation

i2c: add support for MAX1618 in MAX1619 driver

PATCH In review Sebastian Siewior 3 participants 8 messages Sep 16, 2008 – Sep 29, 2008 Hardware monitoring

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i2c: add support for MAX1618 in MAX1619 driver

From: Tobias Himmer <[email protected]>

The difference between MAX1619 and MAX1618 is that the latter has only one measurement register.

---
This patch was done by Tobias some time ago but he was not able to test it because of -ENODEV. I tested this against Linus' current tree. The last commit (of the max1618 driver) in linux-next of today is the same as in Linus' tree.

 drivers/hwmon/Kconfig   |    5 +-
 drivers/hwmon/max1619.c |  185 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 129 insertions(+), 61 deletions(-)
drivers/hwmon/Kconfig +3 -2
index d402e8d..67dda87 100644
@@ -541,10 +541,11 @@ config SENSORS_LM93
 	  will be called lm93.
 
 config SENSORS_MAX1619
-	tristate "Maxim MAX1619 sensor chip"
+	tristate "Maxim MAX1619 / MAX1618 sensor chip"
 	depends on I2C
 	help
-	  If you say yes here you get support for MAX1619 sensor chip.
+	  If you say yes here you get support for MAX1619 and MAX1618
+	  sensor chips.
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called max1619.
drivers/hwmon/max1619.c +126 -59

292 lines not on this page · raw message

Signature · 7 lines
1.5.6.5


_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
#1 lore raw

Re: [lm-sensors] [PATCH] i2c: add support for MAX1618 in MAX1619

Hi Sebastian,

Le mardi 16 septembre 2008, Sebastian Siewior a écrit :

Quoted 13 lines

From: Tobias Himmer <[email protected]>

The difference between MAX1619 and MAX1618 is that the latter has only one measurement register.

---
This patch was done by Tobias some time ago but he was not able to test it because of -ENODEV. I tested this against Linus' current tree. The last commit (of the max1618 driver) in linux-next of today is the same as in Linus' tree.

Quoted 3 lines
 drivers/hwmon/Kconfig   |    5 +-
 drivers/hwmon/max1619.c |  185 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 129 insertions(+), 61 deletions(-)

Your patch is way too big for what it is doing. All you really need to do to have MAX1618 support is prevent the driver from creating the temp1* files in sysfs for this chip. This can be done very easily by having two attribute groups, one for temp1 and one for temp2.

Quoted 60 lines
drivers/hwmon/Kconfig +3 -2
index d402e8d..67dda87 100644
@@ -541,10 +541,11 @@ config SENSORS_LM93
 	  will be called lm93.
 
 config SENSORS_MAX1619
-	tristate "Maxim MAX1619 sensor chip"
+	tristate "Maxim MAX1619 / MAX1618 sensor chip"
 	depends on I2C
 	help
-	  If you say yes here you get support for MAX1619 sensor chip.
+	  If you say yes here you get support for MAX1619 and MAX1618
+	  sensor chips.
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called max1619.
drivers/hwmon/max1619.c +8 -4
index 1ab1cac..c3f4480 100644
@@ -3,12 +3,15 @@
  *             monitoring
  * Copyright (C) 2003-2004 Alexey Fisher <[email protected]>
  *                         Jean Delvare <[email protected]>
+ *                         Tobias Himmer <[email protected]>
  *
  * Based on the lm90 driver. The MAX1619 is a sensor chip made by Maxim.
- * It reports up to two temperatures (its own plus up to
- * one external one). Complete datasheet can be
- * obtained from Maxim's website at:
+ * It reports up to two temperatures (its own plus up to one external one).
+ * This driver will also work on the MAX1618, a stripped down version with
+ * only one (external) temperature source.
+ * Complete datasheets can be obtained from Maxim's website at:
  *   http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf
+ *   http://pdfserv.maxim-ic.com/en/ds/MAX1618.pdf
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,7 +47,7 @@ static const unsigned short normal_i2c[] = {
  * Insmod parameters
  */
 
-I2C_CLIENT_INSMOD_1(max1619);
+I2C_CLIENT_INSMOD_2(max1619, max1618);
 
 /*
  * The MAX1619 registers
@@ -93,6 +96,7 @@ static struct max1619_data *max1619_update_device(struct device *dev);
 
 static const struct i2c_device_id max1619_id[] = {
 	{ "max1619", max1619 },
+	{ "max1618", max1618 },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, max1619_id);

drivers/hwmon/max1619.c static struct i2c_driver max1619_driver = { · line 124

Quoted 5 lines
drivers/hwmon/max1619.c +2 -0
@@ -116,35 +120,50 @@ static struct i2c_driver max1619_driver = {
 struct max1619_data {
 	struct device *hwmon_dev;
 	struct mutex update_lock;
+	const struct attribute_group *group;
+	kernel_ulong_t kind; /* max1619 or max1618 */

Why not "enum chips"?

Quoted 5 lines
drivers/hwmon/max1619.c +0 -1
 	char valid; /* zero until following fields are valid */
 	unsigned long last_updated; /* in jiffies */
 
 	/* registers values */
-	u8 temp_input1; /* local */

drivers/hwmon/max1619.c static struct i2c_driver max1619_driver = { · line 134

Quoted 10 lines
drivers/hwmon/max1619.c +5 -4
-	u8 temp_input2, temp_low2, temp_high2; /* remote */
-	u8 temp_crit2;
-	u8 temp_hyst2;
-	u8 alarms; 
+	u8 local;
+	u8 remote;
+	u8 remote_low, remote_high;
+	u8 remote_crit, remote_hyst;
+	u8 alarms;
 };

This change seems pointless and doesn't belong to this patch anyway.

drivers/hwmon/max1619.c static struct i2c_driver max1619_driver = { · line 146

Quoted 12 lines
drivers/hwmon/max1619.c +7 -0
 /*
  * Sysfs stuff
  */
 
+static ssize_t show_temp1_input(struct device *dev,
+				struct device_attribute *attr, char *buf)
+{
+	struct max1619_data *data = max1619_update_device(dev);
+	return sprintf(buf, "%d\n", TEMP_FROM_REG((data->kind = max1618) ?
+						data->remote : data->local));
+}

You are making things more complex for the sole purpose of having the max1618's single temperature sensor named temp1 instead of temp2. We don't do that usually. We don't really care how the inputs are numbered. If anything, it makes more sense to have the MAX1618 and MAX1619 have the same number for their external sensor, so that the same user-space configuration can support both chips, in case a vendor is switching from one type to the other for any reason.

So, just let the max1618's sensor be named temp2, and your patch will be a lot simpler.

Quoted 109 lines
drivers/hwmon/max1619.c +56 -23
+
+static ssize_t show_temp2_input(struct device *dev,
+				struct device_attribute *attr, char *buf)
+{
+	struct max1619_data *data = max1619_update_device(dev);
+	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->remote));
+}
+
 #define show_temp(value) \
 static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
 	struct max1619_data *data = max1619_update_device(dev); \
 	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
 }
-show_temp(temp_input1);
-show_temp(temp_input2);
-show_temp(temp_low2);
-show_temp(temp_high2);
-show_temp(temp_crit2);
-show_temp(temp_hyst2);
-
-#define set_temp2(value, reg) \
+show_temp(remote_low);
+show_temp(remote_high);
+show_temp(remote_crit);
+show_temp(remote_hyst);
+
+#define set_temp(value, reg) \
 static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
 	size_t count) \
 { \
@@ -158,11 +177,10 @@ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, co
 	mutex_unlock(&data->update_lock); \
 	return count; \
 }
-
-set_temp2(temp_low2, MAX1619_REG_W_REMOTE_LOW);
-set_temp2(temp_high2, MAX1619_REG_W_REMOTE_HIGH);
-set_temp2(temp_crit2, MAX1619_REG_W_REMOTE_CRIT);
-set_temp2(temp_hyst2, MAX1619_REG_W_TCRIT_HYST);
+set_temp(remote_low, MAX1619_REG_W_REMOTE_LOW);
+set_temp(remote_high, MAX1619_REG_W_REMOTE_HIGH);
+set_temp(remote_crit, MAX1619_REG_W_REMOTE_CRIT);
+set_temp(remote_hyst, MAX1619_REG_W_TCRIT_HYST);
 
 static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -178,22 +196,50 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
 	return sprintf(buf, "%d\n", (data->alarms >> bitnr) & 1);
 }
 
-static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input1, NULL);
-static DEVICE_ATTR(temp2_input, S_IRUGO, show_temp_input2, NULL);
-static DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp_low2,
-	set_temp_low2);
-static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp_high2,
-	set_temp_high2);
-static DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_temp_crit2,
-	set_temp_crit2);
-static DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_temp_hyst2,
-	set_temp_hyst2);
+/* These are for both - MAX1619 and MAX1618 */
+static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp1_input, NULL);
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+
+/* These are just for MAX1619 */
+static DEVICE_ATTR(temp2_input, S_IRUGO, show_temp2_input, NULL);
+static DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_remote_low,
+		   set_remote_low);
+static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_remote_high,
+		   set_remote_high);
+static DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_remote_crit,
+		   set_remote_crit);
+static DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_remote_hyst,
+		   set_remote_hyst);
 static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 1);
 static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 2);
 static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);
 static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 4);
 
+/* These are just for MAX1618 */
+static DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_remote_low,
+		   set_remote_low);
+static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_remote_high,
+		   set_remote_high);
+static SENSOR_DEVICE_ATTR(temp1_fault, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 4);
+
+static struct attribute *max1618_attributes[] = {
+	&dev_attr_temp1_input.attr,
+	&dev_attr_temp1_min.attr,
+	&dev_attr_temp1_max.attr,
+
+	&dev_attr_alarms.attr,
+	&sensor_dev_attr_temp1_fault.dev_attr.attr,
+	&sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
+	&sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
+	NULL
+};
+
+static const struct attribute_group max1618_group = {
+	.attrs = max1618_attributes,
+};
+
 static struct attribute *max1619_attributes[] = {
 	&dev_attr_temp1_input.attr,
 	&dev_attr_temp2_input.attr,

drivers/hwmon/max1619.c static int max1619_detect(struct i2c_client *new_client, int kind, · line 305

Quoted 5 lines
drivers/hwmon/max1619.c +1 -1
@@ -256,14 +302,24 @@ static int max1619_detect(struct i2c_client *new_client, int kind,
 
 	if (kind <= 0) { /* identification */
 		u8 man_id, chip_id;
-	
+

Coding style clean-ups are better submitted separately.

Quoted 24 lines
drivers/hwmon/max1619.c +13 -3
 		man_id = i2c_smbus_read_byte_data(new_client,
 			 MAX1619_REG_R_MAN_ID);
 		chip_id = i2c_smbus_read_byte_data(new_client,
 			  MAX1619_REG_R_CHIP_ID);
-		
-		if ((man_id = 0x4D) && (chip_id = 0x04))
-			kind = max1619;
+
+		if (man_id = 0x4D) {
+			switch (chip_id) {
+			case 0x04:
+				kind = max1619;
+				strlcpy(info->type, "max1619", I2C_NAME_SIZE);
+				break;
+			case 0x02:
+				kind = max1618;
+				strlcpy(info->type, "max1618", I2C_NAME_SIZE);
+				break;
+			}
+		}
 
 		if (kind <= 0) { /* identification failed */
 			dev_info(&adapter->dev,

drivers/hwmon/max1619.c static int max1619_detect(struct i2c_client *new_client, int kind, · line 334

Quoted 8 lines
drivers/hwmon/max1619.c +0 -2
@@ -273,8 +329,6 @@ static int max1619_detect(struct i2c_client *new_client, int kind,
 		}
 	}
 
-	strlcpy(info->type, "max1619", I2C_NAME_SIZE);
-
 	return 0;
 }
 

You are breaking the various "force" module parameters here. Forced chips won't have a name so their devices won't possibly be instantiated.

Quoted 66 lines
drivers/hwmon/max1619.c +23 -18
@@ -298,7 +352,15 @@ static int max1619_probe(struct i2c_client *new_client,
 	max1619_init_client(new_client);
 
 	/* Register sysfs hooks */
-	if ((err = sysfs_create_group(&new_client->dev.kobj, &max1619_group)))
+	if (id->driver_data = max1618) {
+		data->group = &max1618_group;
+		data->kind = max1618;
+	} else {
+		data->group = &max1619_group;
+		data->kind = max1619;
+	}
+	err = sysfs_create_group(&new_client->dev.kobj, data->group);
+	if (err)
 		goto exit_free;
 
 	data->hwmon_dev = hwmon_device_register(&new_client->dev);
@@ -310,7 +372,7 @@ static int max1619_probe(struct i2c_client *new_client,
 	return 0;
 
 exit_remove_files:
-	sysfs_remove_group(&new_client->dev.kobj, &max1619_group);
+	sysfs_remove_group(&new_client->dev.kobj, data->group);
 exit_free:
 	kfree(data);
 exit:
@@ -337,7 +399,7 @@ static int max1619_remove(struct i2c_client *client)
 	struct max1619_data *data = i2c_get_clientdata(client);
 
 	hwmon_device_unregister(data->hwmon_dev);
-	sysfs_remove_group(&client->dev.kobj, &max1619_group);
+	sysfs_remove_group(&client->dev.kobj, data->group);
 
 	kfree(data);
 	return 0;
@@ -352,21 +414,25 @@ static struct max1619_data *max1619_update_device(struct device *dev)
 
 	if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
 		dev_dbg(&client->dev, "Updating max1619 data.\n");
-		data->temp_input1 = i2c_smbus_read_byte_data(client,
-					MAX1619_REG_R_LOCAL_TEMP);
-		data->temp_input2 = i2c_smbus_read_byte_data(client,
-					MAX1619_REG_R_REMOTE_TEMP);
-		data->temp_high2 = i2c_smbus_read_byte_data(client,
-					MAX1619_REG_R_REMOTE_HIGH);
-		data->temp_low2 = i2c_smbus_read_byte_data(client,
-					MAX1619_REG_R_REMOTE_LOW);
-		data->temp_crit2 = i2c_smbus_read_byte_data(client,
-					MAX1619_REG_R_REMOTE_CRIT);
-		data->temp_hyst2 = i2c_smbus_read_byte_data(client,
-					MAX1619_REG_R_TCRIT_HYST);
-		data->alarms = i2c_smbus_read_byte_data(client,
-					MAX1619_REG_R_STATUS);
-
+		switch (data->kind) {
+		default:
+			data->local = i2c_smbus_read_byte_data(
+				client, MAX1619_REG_R_LOCAL_TEMP);
+			data->remote_crit = i2c_smbus_read_byte_data(
+				client, MAX1619_REG_R_REMOTE_CRIT);
+			data->remote_hyst = i2c_smbus_read_byte_data(
+				client, MAX1619_REG_R_TCRIT_HYST);
+		/* fallthrough */
+		case max1618:
+			data->remote = i2c_smbus_read_byte_data(
+				client, MAX1619_REG_R_REMOTE_TEMP);

drivers/hwmon/max1619.c static struct max1619_data *max1619_update_device(struct device *dev) · line 438

Quoted 10 lines
drivers/hwmon/max1619.c +7 -0
+			data->remote_high = i2c_smbus_read_byte_data(
+				client, MAX1619_REG_R_REMOTE_HIGH);
+			data->remote_low = i2c_smbus_read_byte_data(
+				client, MAX1619_REG_R_REMOTE_LOW);
+			data->alarms = i2c_smbus_read_byte_data(
+				client, MAX1619_REG_R_STATUS);
+		}
 		data->last_updated = jiffies;
 		data->valid = 1;
 	}

I doubt this works at all. The "default" test will always succeed, so all the registers will be read for both the max1618 and max1619.

Quoted 14 lines
drivers/hwmon/max1619.c +4 -3
@@ -386,9 +452,10 @@ static void __exit sensors_max1619_exit(void)
 	i2c_del_driver(&max1619_driver);
 }
 
-MODULE_AUTHOR("Alexey Fisher <[email protected]> and "
-	"Jean Delvare <[email protected]>");
-MODULE_DESCRIPTION("MAX1619 sensor driver");
+MODULE_AUTHOR("Alexey Fisher <[email protected]>, "
+	"Jean Delvare <[email protected]>, "
+	"Tobias Himmer <[email protected]>");
+MODULE_DESCRIPTION("MAX1619 / MAX1618 sensor driver");
 MODULE_LICENSE("GPL");
 
 module_init(sensors_max1619_init);
Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
#2 lore raw

Re: [lm-sensors] [PATCH] i2c: add support for MAX1618 in MAX1619

In reply to Sebastian Siewior

Oh, BTW...

Le mardi 16 septembre 2008, Sebastian Siewior a écrit :

Quoted 13 lines

From: Tobias Himmer <[email protected]>

The difference between MAX1619 and MAX1618 is that the latter has only one measurement register.

---
This patch was done by Tobias some time ago but he was not able to test it because of -ENODEV. I tested this against Linus' current tree. The last commit (of the max1618 driver) in linux-next of today is the same as in Linus' tree.

Quoted 3 lines
 drivers/hwmon/Kconfig   |    5 +-
 drivers/hwmon/max1619.c |  185 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 129 insertions(+), 61 deletions(-)

Please update Documentation/hwmon/max1619 as well.

Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
#3 lore raw

Re: [lm-sensors] [PATCH] i2c: add support for MAX1618 in MAX1619

In reply to Sebastian Siewior

Review

Quoted 2 lines · On Tue, 16 Sep 2008 15:35:42 +0200 Sebastian Siewior <[email protected]>…
(quoted diff) +2 -0
+	return sprintf(buf, "%d\n", TEMP_FROM_REG((data->kind = max1618) ?
+						data->remote : data->local));

oh dear.

#define TEMP_FROM_REG(val) ((val & 0x80 ? val-0x100 : val) * 1000)

Imagine how truly awful the code generation must be here.

Look:

drivers/hwmon/max1619.c renamed from drivers/hwmon/max1619.c~a +9 -2
@@ -75,8 +75,15 @@ I2C_CLIENT_INSMOD_2(max1619, max1618);
  * Conversions and various macros
  */
 
-#define TEMP_FROM_REG(val)	((val & 0x80 ? val-0x100 : val) * 1000)
-#define TEMP_TO_REG(val)	((val < 0 ? val+0x100*1000 : val) / 1000)
+static int TEMP_FROM_REG(int val)
+{
+	return ((val & 0x80 ? val-0x100 : val) * 1000);
+}
+
+static int TEMP_TO_REG(int val)
+{
+	return (val < 0 ? val+0x100*1000 : val) / 1000;
+}
 
 /*
  * Functions declaration

_

          text    data     bss     dec     hex filename
before:   3927    1148      28    5103    13ef drivers/hwmon/max1619.o
after:    3743    1148      28    4919    1337 drivers/hwmon/max1619.o

That's a 6% reduction in the number of instructions in the whole driver!

Not only that, it generates nicer-to-read code and it fixes the bugs which will occur if someone calls one of these macros with an expression which has side-effects.

Macros suck, suck, suck, suck and the kernel is just littered with the stupid things in places where they were completely unnecessary.

argh.

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#4 lore raw

Re: [lm-sensors] [PATCH] i2c: add support for MAX1618 in MAX1619

In reply to Sebastian Siewior
Quoted 6 lines · Jean Delvare

Hi Sebastian,

Your patch is way too big for what it is doing. All you really need to do to have MAX1618 support is prevent the driver from creating the temp1* files in sysfs for this chip. This can be done very easily by having two attribute groups, one for temp1 and one for temp2.

Thanks for the review. I try address your issues but it may take some time.

Sebastian

Signature · 9 lines
Firmensitz: 88690 Uhldingen, Auf dem Berg 3
Registergericht: Amtsgericht Freiburg i. Br., HRB 700 806;
StNr. 87007/07777; Ust-Id Nr.: DE252739476
Geschäftsführer: Heinz Egger, Thomas Gleixner

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
#5 lore raw

Re: [lm-sensors] [PATCH] i2c: add support for MAX1618 in MAX1619

In reply to Sebastian Siewior

Hi Andrew,

Quoted 43 lines · Andrew Morton

drivers/hwmon/max1619.c static struct i2c_driver max1619_driver = { · line 145

Quoted 2 lines · On Tue, 16 Sep 2008 15:35:42 +0200 Sebastian Siewior <[email protected]>…
drivers/hwmon/max1619.c +2 -0
+	return sprintf(buf, "%d\n", TEMP_FROM_REG((data->kind = max1618) ?
+						data->remote : data->local));

oh dear.

#define TEMP_FROM_REG(val) ((val & 0x80 ? val-0x100 : val) * 1000)

Imagine how truly awful the code generation must be here.

Look:

drivers/hwmon/max1619.c renamed from drivers/hwmon/max1619.c~a +9 -2
@@ -75,8 +75,15 @@ I2C_CLIENT_INSMOD_2(max1619, max1618);
  * Conversions and various macros
  */
 
-#define TEMP_FROM_REG(val)	((val & 0x80 ? val-0x100 : val) * 1000)
-#define TEMP_TO_REG(val)	((val < 0 ? val+0x100*1000 : val) / 1000)
+static int TEMP_FROM_REG(int val)
+{
+	return ((val & 0x80 ? val-0x100 : val) * 1000);
+}
+
+static int TEMP_TO_REG(int val)
+{
+	return (val < 0 ? val+0x100*1000 : val) / 1000;
+}
 
 /*
  * Functions declaration

_

          text    data     bss     dec     hex filename
before:   3927    1148      28    5103    13ef drivers/hwmon/max1619.o
after:    3743    1148      28    4919    1337 drivers/hwmon/max1619.o

That's a 6% reduction in the number of instructions in the whole driver!

Quoted 7 lines

Not only that, it generates nicer-to-read code and it fixes the bugs which will occur if someone calls one of these macros with an expression which has side-effects.

Macros suck, suck, suck, suck and the kernel is just littered with the stupid things in places where they were completely unnecessary.

I totally support this change. We are trying to get rid of these macros in all hwmon drivers but there are still a number drivers that had not been cleaned up. One down, thanks.

I'm taking this patch in my hwmon tree. I've added a proper summary and fixed checkpatch warnings.

Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
#6 lore raw

Re: [lm-sensors] [PATCH] i2c: add support for MAX1618 in MAX1619

In reply to Sebastian Siewior
Quoted 34 lines · On Sun, 28 Sep 2008 18:02:40 +0200 Jean Delvare <[email protected]> wrote:
Quoted 21 lines
(quoted diff) +9 -0
+static int TEMP_FROM_REG(int val)
+{
+	return ((val & 0x80 ? val-0x100 : val) * 1000);
+}
+
+static int TEMP_TO_REG(int val)
+{
+	return (val < 0 ? val+0x100*1000 : val) / 1000;
+}
 
 /*
  * Functions declaration

_

          text    data     bss     dec     hex filename
before:   3927    1148      28    5103    13ef drivers/hwmon/max1619.o
after:    3743    1148      28    4919    1337 drivers/hwmon/max1619.o

That's a 6% reduction in the number of instructions in the whole driver!

Quoted 7 lines

Not only that, it generates nicer-to-read code and it fixes the bugs which will occur if someone calls one of these macros with an expression which has side-effects.

Macros suck, suck, suck, suck and the kernel is just littered with the stupid things in places where they were completely unnecessary.

I totally support this change. We are trying to get rid of these macros in all hwmon drivers but there are still a number drivers that had not been cleaned up. One down, thanks.

Quoted 2 lines

I'm taking this patch in my hwmon tree. I've added a proper summary and fixed checkpatch warnings.

Fair enough, thanks. However there's no reason now for those functions to have upper-case names. Perhaps you changed that as well.

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#7 lore raw

Re: [lm-sensors] [PATCH] i2c: add support for MAX1618 in MAX1619

In reply to Sebastian Siewior
Quoted 34 lines · Andrew Morton
Quoted 34 lines · On Sun, 28 Sep 2008 18:02:40 +0200 Jean Delvare <[email protected]> wrote:
Quoted 21 lines
(quoted diff) +9 -0
+static int TEMP_FROM_REG(int val)
+{
+	return ((val & 0x80 ? val-0x100 : val) * 1000);
+}
+
+static int TEMP_TO_REG(int val)
+{
+	return (val < 0 ? val+0x100*1000 : val) / 1000;
+}
 
 /*
  * Functions declaration

_

          text    data     bss     dec     hex filename
before:   3927    1148      28    5103    13ef drivers/hwmon/max1619.o
after:    3743    1148      28    4919    1337 drivers/hwmon/max1619.o

That's a 6% reduction in the number of instructions in the whole driver!

Quoted 7 lines

Not only that, it generates nicer-to-read code and it fixes the bugs which will occur if someone calls one of these macros with an expression which has side-effects.

Macros suck, suck, suck, suck and the kernel is just littered with the stupid things in places where they were completely unnecessary.

I totally support this change. We are trying to get rid of these macros in all hwmon drivers but there are still a number drivers that had not been cleaned up. One down, thanks.

Quoted 5 lines
Quoted 2 lines

I'm taking this patch in my hwmon tree. I've added a proper summary and fixed checkpatch warnings.

Fair enough, thanks. However there's no reason now for those functions to have upper-case names. Perhaps you changed that as well.

Correct, done.

Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors