Hi Greg, Jean,
This small patch changes two drivers, adm1025 and adm1026, to
report vid as cpu0_vid sysfs name as used by the other drivers.
Added duplicated names and six month warning for old names to
be removed as requested. Compile tested.
--Grant.
Signed-off-by: Grant Coady <gcoady at gmail.com>
---
Documentation/feature-removal-schedule.txt | 10 ++++++++++
drivers/i2c/chips/adm1025.c | 4 ++++
drivers/i2c/chips/adm1026.c | 5 ++++-
3 files changed, 18 insertions(+), 1 deletion(-)
diff -X dontdiff -Nrup linux-2.6.12-rc3-mm3/Documentation/feature-removal-schedule.txt linux-2.6.12-rc3-mm3a/Documentation/feature-removal-schedule.txt
--- linux-2.6.12-rc3-mm3/Documentation/feature-removal-schedule.txt 2005-05-06 04:43:25.000000000 +1000
+++ linux-2.6.12-rc3-mm3a/Documentation/feature-removal-schedule.txt 2005-05-11 18:17:15.000000000 +1000
@@ -71,3 +71,13 @@ When: April 2006
Files: kernel/panic.c
Why: No modular usage in the kernel.
Who: Adrian Bunk <bunk at stusta.de>
+
+---------------------------
+
+What: i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid
+When: November 2005
+Files: drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c
+Why: Match the other drivers' name for the same function, duplicate names
+ will be available until removal of old names.
+Who: Grant Coady <gcoady at gmail.com>
+
diff -X dontdiff -Nrup linux-2.6.12-rc3-mm3/drivers/i2c/chips/adm1025.c linux-2.6.12-rc3-mm3a/drivers/i2c/chips/adm1025.c
--- linux-2.6.12-rc3-mm3/drivers/i2c/chips/adm1025.c 2005-05-06 04:43:26.000000000 +1000
+++ linux-2.6.12-rc3-mm3a/drivers/i2c/chips/adm1025.c 2005-05-11 18:06:03.000000000 +1000
@@ -286,7 +286,9 @@ static ssize_t show_vid(struct device *d
struct adm1025_data *data = adm1025_update_device(dev);
return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));
}
+/* in1_ref is deprecated in favour of cpu0_vid, remove after 2005-11-11 */
static DEVICE_ATTR(in1_ref, S_IRUGO, show_vid, NULL);
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
static ssize_t show_vrm(struct device *dev, char *buf)
{
@@ -436,7 +438,9 @@ static int adm1025_detect(struct i2c_ada
device_create_file(&new_client->dev, &dev_attr_temp1_max);
device_create_file(&new_client->dev, &dev_attr_temp2_max);
device_create_file(&new_client->dev, &dev_attr_alarms);
+ /* in1_ref is deprecated, remove after 2005-11-11 */
device_create_file(&new_client->dev, &dev_attr_in1_ref);
+ device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
device_create_file(&new_client->dev, &dev_attr_vrm);
/* Pin 11 is either in4 (+12V) or VID4 */
diff -X dontdiff -Nrup linux-2.6.12-rc3-mm3/drivers/i2c/chips/adm1026.c linux-2.6.12-rc3-mm3a/drivers/i2c/chips/adm1026.c
--- linux-2.6.12-rc3-mm3/drivers/i2c/chips/adm1026.c 2005-05-06 04:43:26.000000000 +1000
+++ linux-2.6.12-rc3-mm3a/drivers/i2c/chips/adm1026.c 2005-05-11 18:06:09.000000000 +1000
@@ -1266,8 +1266,9 @@ static ssize_t show_vid_reg(struct devic
struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", vid_from_reg(data->vid & 0x3f, data->vrm));
}
-
+/* vid deprecated in favour of cpu0_vid, remove after 2005-11-11 */
static DEVICE_ATTR(vid, 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)
{
@@ -1707,7 +1708,9 @@ int adm1026_detect(struct i2c_adapter *a
device_create_file(&new_client->dev, &dev_attr_temp1_crit_enable);
device_create_file(&new_client->dev, &dev_attr_temp2_crit_enable);
device_create_file(&new_client->dev, &dev_attr_temp3_crit_enable);
+ /* vid deprecated in favour of cpu0_vid, remove after 2005-11-11 */
device_create_file(&new_client->dev, &dev_attr_vid);
+ device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
device_create_file(&new_client->dev, &dev_attr_vrm);
device_create_file(&new_client->dev, &dev_attr_alarms);
device_create_file(&new_client->dev, &dev_attr_alarm_mask);
