I2C: rename in0_ref to cpu0_vid

PATCH New Jean Delvare 2 participants 2 messages May 19, 2005 I2C

lore

Share & tools

lore

Jean Delvare

author

2005-05-19 06:25 UTC #0 lore raw

PATCH 1/1 I2C: rename in0_ref to cpu0_vid

Hi Greg,

This patch changes all the i2c chip drivers and documentation to use the name "cpu0_vid" instead of "in0_ref". The name "in0_ref" was an error in the first place as motherboard manufacturers may fail to follow the chip manufacturer's recommendation about which "in" channel to use for VCore monitoring.

The new name leaves room for chips able to monitor more than 1 vid value, such as the LM93 and, to a lesser extent, the PC87360 family (all by National Semiconductor). These chips are typically designed for dual-CPU motherboards.

This breaks the interface (obviously) so libsensors has been updated to support both names.

Please apply,
thanks.

Signed-off-by; Jean Delvare <khali at linux-fr dot org>

Documentation/i2c/sysfs-interface +1 -1

diff -ruN linux-2.6.8-rc4.orig/Documentation/i2c/sysfs-interface linux-2.6.8-rc4/Documentation/i2c/sysfs-interface
@@ -104,7 +104,7 @@
 			in7_*	varies
 			in8_*	varies
 
-in0_ref		CPU core reference voltage.
+cpu[0-1]_vid	CPU core reference voltage.
 		Unit: millivolt
 		Read only.
 		Not always correct.

drivers/i2c/chips/asb100.c +2 -2

diff -ruN linux-2.6.8-rc4.orig/drivers/i2c/chips/asb100.c linux-2.6.8-rc4/drivers/i2c/chips/asb100.c
@@ -520,9 +520,9 @@
 	return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
 }
 
-static DEVICE_ATTR(in0_ref, S_IRUGO, show_vid, NULL);
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 #define device_create_file_vid(client) \
-device_create_file(&client->dev, &dev_attr_in0_ref)
+device_create_file(&client->dev, &dev_attr_cpu0_vid)
 
 /* VRM */
 static ssize_t show_vrm(struct device *dev, char *buf)

drivers/i2c/chips/it87.c +2 -2

diff -ruN linux-2.6.8-rc4.orig/drivers/i2c/chips/it87.c linux-2.6.8-rc4/drivers/i2c/chips/it87.c
@@ -571,9 +571,9 @@
 	struct it87_data *data = it87_update_device(dev);
 	return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
 }
-static DEVICE_ATTR(in0_ref, S_IRUGO, show_vid_reg, NULL);
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 #define device_create_file_vid(client) \
-device_create_file(&client->dev, &dev_attr_in0_ref)
+device_create_file(&client->dev, &dev_attr_cpu0_vid)
 
 /* This function is called when:
      * it87_driver is inserted (when this module is loaded), for each

drivers/i2c/chips/lm78.c +2 -2

diff -ruN linux-2.6.8-rc4.orig/drivers/i2c/chips/lm78.c linux-2.6.8-rc4/drivers/i2c/chips/lm78.c
@@ -423,7 +423,7 @@
 	struct lm78_data *data = lm78_update_device(dev);
 	return sprintf(buf, "%d\n", VID_FROM_REG(data->vid));
 }
-static DEVICE_ATTR(in0_ref, S_IRUGO, show_vid, NULL);
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
 /* Alarms */
 static ssize_t show_alarms(struct device *dev, char *buf)

@@ -615,7 +615,7 @@
 	device_create_file(&new_client->dev, &dev_attr_fan3_min);
 	device_create_file(&new_client->dev, &dev_attr_fan3_div);
 	device_create_file(&new_client->dev, &dev_attr_alarms);
-	device_create_file(&new_client->dev, &dev_attr_in0_ref);
+	device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
 
 	return 0;

drivers/i2c/chips/lm85.c +2 -2

diff -ruN linux-2.6.8-rc4.orig/drivers/i2c/chips/lm85.c linux-2.6.8-rc4/drivers/i2c/chips/lm85.c
@@ -465,7 +465,7 @@
 	return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
 }
 
-static DEVICE_ATTR(in0_ref, S_IRUGO, show_vid_reg, NULL);
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 
 static ssize_t show_vrm_reg(struct device *dev, char *buf)
 {

@@ -874,7 +874,7 @@
 	device_create_file(&new_client->dev, &dev_attr_temp2_max);
 	device_create_file(&new_client->dev, &dev_attr_temp3_max);
 	device_create_file(&new_client->dev, &dev_attr_vrm);
-	device_create_file(&new_client->dev, &dev_attr_in0_ref);
+	device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
 	device_create_file(&new_client->dev, &dev_attr_alarms);
 
 	return 0;

drivers/i2c/chips/w83627hf.c +2 -2

diff -ruN linux-2.6.8-rc4.orig/drivers/i2c/chips/w83627hf.c linux-2.6.8-rc4/drivers/i2c/chips/w83627hf.c
@@ -635,9 +635,9 @@
 	struct w83627hf_data *data = w83627hf_update_device(dev);
 	return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
 }
-static DEVICE_ATTR(in0_ref, S_IRUGO, show_vid_reg, NULL);
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 #define device_create_file_vid(client) \
-device_create_file(&client->dev, &dev_attr_in0_ref)
+device_create_file(&client->dev, &dev_attr_cpu0_vid)
 
 static ssize_t
 show_vrm_reg(struct device *dev, char *buf)

drivers/i2c/chips/w83781d.c +2 -2

diff -ruN linux-2.6.8-rc4.orig/drivers/i2c/chips/w83781d.c linux-2.6.8-rc4/drivers/i2c/chips/w83781d.c
@@ -503,9 +503,9 @@
 }
 
 static
-DEVICE_ATTR(in0_ref, S_IRUGO, show_vid_reg, NULL);
+DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 #define device_create_file_vid(client) \
-device_create_file(&client->dev, &dev_attr_in0_ref);
+device_create_file(&client->dev, &dev_attr_cpu0_vid);
 static ssize_t
 show_vrm_reg(struct device *dev, char *buf)
 {

Signature · 2 lines

Jean "Khali" Delvare
http://khali.linux-fr.org/

Greg KH

Applied

2005-05-19 06:25 UTC #1 lore raw

PATCH 1/1 I2C: rename in0_ref to cpu0_vid

Quoted 13 lines · Jean Delvare

Hi Greg,
This patch changes all the i2c chip drivers and documentation to use the name "cpu0_vid" instead of "in0_ref". The name "in0_ref" was an error in the first place as motherboard manufacturers may fail to follow the chip manufacturer's recommendation about which "in" channel to use for VCore monitoring.
The new name leaves room for chips able to monitor more than 1 vid value, such as the LM93 and, to a lesser extent, the PC87360 family (all by National Semiconductor). These chips are typically designed for dual-CPU motherboards.

Quoted 4 lines

This breaks the interface (obviously) so libsensors has been updated to support both names.
Please apply,

Applied, thanks.

greg k-h