[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid

[Grant Coady]

Hi Greg,

This small patch changes two drivers, adm1025 and adm1026, to 
report vid as cpu0_vid sysfs name as used by the other drivers.

--Grant


Signed-off-by: Grant Coady <gcoady@gmail.com>

---
 adm1025.c |    4 ++--
 adm1026.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -X dontdiff -Nru linux-2.6.12-rc3-mm3/drivers/i2c/chips/adm1025.c linux-2.6.12-rc3-mm3b/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-mm3b/drivers/i2c/chips/adm1025.c	2005-05-07 02:26:15.000000000 +1000
@@ -286,7 +286,7 @@
 	struct adm1025_data *data = adm1025_update_device(dev);
 	return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));
 }
-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 +436,7 @@
 	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);
-	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 -Nru linux-2.6.12-rc3-mm3/drivers/i2c/chips/adm1026.c linux-2.6.12-rc3-mm3b/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-mm3b/drivers/i2c/chips/adm1026.c	2005-05-07 02:27:51.000000000 +1000
@@ -1267,7 +1267,7 @@
 	return sprintf(buf,"%d\n", vid_from_reg(data->vid & 0x3f, data->vrm));
 }
 
-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 +1707,7 @@
 	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);
-	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);

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid

[Jean Delvare]

Hi Grant,

> This small patch changes two drivers, adm1025 and adm1026, to 
> report vid as cpu0_vid sysfs name as used by the other drivers.

This patch (alone) doesn't please me. For one thing, you should
duplicate, not rename, the attributes, so as to not break compatibility.
Tag the old ones as "to remove after <some date>". Also, a patch to
libsensors to accept the new names is obviously needed.

Thanks,
-- 
Jean Delvare

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid

[Greg KH]

On Tue, May 10, 2005 at 08:30:31PM +0200, Jean Delvare wrote:
> Hi Grant,
> 
> > This small patch changes two drivers, adm1025 and adm1026, to 
> > report vid as cpu0_vid sysfs name as used by the other drivers.
> 
> This patch (alone) doesn't please me. For one thing, you should
> duplicate, not rename, the attributes, so as to not break compatibility.
> Tag the old ones as "to remove after <some date>". Also, a patch to
> libsensors to accept the new names is obviously needed.

Ok, I've now dropped this one.

thanks,

greg k-h

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid

[Grant Coady]

On Tue, 10 May 2005 20:30:31 +0200, Jean Delvare <khali@linux-fr.org> wrote:

>Hi Grant,
>
>> This small patch changes two drivers, adm1025 and adm1026, to 
>> report vid as cpu0_vid sysfs name as used by the other drivers.
>
>This patch (alone) doesn't please me. For one thing, you should
>duplicate, not rename, the attributes, so as to not break compatibility.

Oops, forgot that aspect.  I need to change adm9240 in libsensors too
'cos I renamed analog_out, does it need chassis_clear?  Nothing else 
has it.  I only put it in the driver 'cos old comment said they 
couldn't get chassis clear it to work, Intel doc. error :)  

>Tag the old ones as "to remove after <some date>". Also, a patch to
>libsensors to accept the new names is obviously needed.

What sort of timeframe you suggest for remove after?

--Grant

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid

[Jean Delvare]

Hi Grant,

> Oops, forgot that aspect.  I need to change adm9240 in libsensors too
> 'cos I renamed analog_out, does it need chassis_clear?  Nothing else
> has it.  I only put it in the driver 'cos old comment said they
> couldn't get chassis clear it to work, Intel doc. error :)

Don't worry about chassis clear, it wasn't supported so far so I guess
there's little need for it. But yes analog_out and I guess vid need a
patch.

> > Tag the old ones as "to remove after <some date>". Also, a patch to
> > libsensors to accept the new names is obviously needed.
>
> What sort of timeframe you suggest for remove after?

Hmm, 6 months after the original change maybe?

Thanks,
--
Jean Delvare

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid

[Greg KH]

On Wed, May 11, 2005 at 09:31:50AM +0200, Jean Delvare wrote:
> > > Tag the old ones as "to remove after <some date>". Also, a patch to
> > > libsensors to accept the new names is obviously needed.
> >
> > What sort of timeframe you suggest for remove after?
> 
> Hmm, 6 months after the original change maybe?

Just be sure to document it in
Documentation/feature-removal-schedule.txt and everyone will be happy :)

thanks,

greg k-h

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid

[Jean Delvare]

Hi Greg,

> > Hmm, 6 months after the original change maybe?
>
> Just be sure to document it in
> Documentation/feature-removal-schedule.txt and everyone will be happy :)

I didn't know such a file even existed, but it sounds like a good idea.
This shouldn't prevent us from tagging the lines in the driver itself,
as I believe people (including us) are more likely to read it there.

Thanks,
--
Jean Delvare

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid, take 2

[Grant Coady]

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@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@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@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);

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid

[Greg KH]

On Wed, May 11, 2005 at 09:50:18AM +0200, Jean Delvare wrote:
> 
> Hi Greg,
> 
> > > Hmm, 6 months after the original change maybe?
> >
> > Just be sure to document it in
> > Documentation/feature-removal-schedule.txt and everyone will be happy :)
> 
> I didn't know such a file even existed, but it sounds like a good idea.
> This shouldn't prevent us from tagging the lines in the driver itself,
> as I believe people (including us) are more likely to read it there.

We will notice it there.  But the "public" will not.  That is why we
created that file :)

thanks,

greg k-h

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid, take 2

[Jean Delvare]

Hi Grant,

> 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.

The patch is fine but doesn't apply to my tree. Could you possibly
regenerate it against 2.6.12-rc4?

Thanks,
-- 
Jean Delvare

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid, take 2

[Grant Coady]

On Wed, 11 May 2005 19:54:29 +0200, Jean Delvare <khali@linux-fr.org> wrote:

>> 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.
>
>The patch is fine but doesn't apply to my tree. Could you possibly
>regenerate it against 2.6.12-rc4?

Yes, but no point including Documentation/feature-removal-schedule.txt 
patch as that file way behind in 2.6.12-rc4 compared to rc3-mm3

--Grant.


Signed-off-by: Grant Coady <gcoady@gmail.com>

---
 adm1025.c |    4 ++++
 adm1026.c |    5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff -X dontdiff -Nru linux-2.6.12-rc4/drivers/i2c/chips/adm1025.c linux-2.6.12-rc4a/drivers/i2c/chips/adm1025.c
--- linux-2.6.12-rc4/drivers/i2c/chips/adm1025.c	2004-12-25 08:33:47.000000000 +1100
+++ linux-2.6.12-rc4a/drivers/i2c/chips/adm1025.c	2005-05-12 07:28:17.000000000 +1000
@@ -280,7 +280,9 @@
 	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)
 {
@@ -431,7 +433,9 @@
 	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 -Nru linux-2.6.12-rc4/drivers/i2c/chips/adm1026.c linux-2.6.12-rc4a/drivers/i2c/chips/adm1026.c
--- linux-2.6.12-rc4/drivers/i2c/chips/adm1026.c	2005-03-30 08:33:41.000000000 +1000
+++ linux-2.6.12-rc4a/drivers/i2c/chips/adm1026.c	2005-05-12 07:28:17.000000000 +1000
@@ -1288,8 +1288,9 @@
 	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)
 {
@@ -1740,7 +1741,9 @@
 	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);

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid, take 2

[Greg KH]

On Thu, May 12, 2005 at 08:21:39AM +1000, Grant Coady wrote:
> On Wed, 11 May 2005 19:54:29 +0200, Jean Delvare <khali@linux-fr.org> wrote:
> 
> >> 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.
> >
> >The patch is fine but doesn't apply to my tree. Could you possibly
> >regenerate it against 2.6.12-rc4?
> 
> Yes, but no point including Documentation/feature-removal-schedule.txt 
> patch as that file way behind in 2.6.12-rc4 compared to rc3-mm3

What do you mean?  Who knows if those changes will make it into a later
kernel.  Patching against 2.6.12-rc4 allows me to accept the patch,
which will put it into the -mm tree.  Please do that.

thanks,

greg k-h

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid, take 3

[Grant Coady]

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.

Rediff'd to 2.6.12-rc4 as requested, take 2 completely bogus, sorry.

--Grant.


Signed-off-by: Grant Coady <gcoady@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 -Nru linux-2.6.12-rc4/Documentation/feature-removal-schedule.txt linux-2.6.12-rc4a/Documentation/feature-removal-schedule.txt
--- linux-2.6.12-rc4/Documentation/feature-removal-schedule.txt	2005-05-12 09:47:29.000000000 +1000
+++ linux-2.6.12-rc4a/Documentation/feature-removal-schedule.txt	2005-05-12 10:26:23.000000000 +1000
@@ -63,3 +63,13 @@
 	people, who might be using implementations that I am not aware
 	of, to adjust to this upcoming change.
 Who:	Paul E. McKenney <paulmck@us.ibm.com>
+
+---------------------------
+
+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@gmail.com>
+
diff -X dontdiff -Nru linux-2.6.12-rc4/drivers/i2c/chips/adm1025.c linux-2.6.12-rc4a/drivers/i2c/chips/adm1025.c
--- linux-2.6.12-rc4/drivers/i2c/chips/adm1025.c	2005-05-12 09:47:33.000000000 +1000
+++ linux-2.6.12-rc4a/drivers/i2c/chips/adm1025.c	2005-05-12 10:23:49.000000000 +1000
@@ -287,7 +287,9 @@
 	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)
 {
@@ -437,7 +439,9 @@
 	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 -Nru linux-2.6.12-rc4/drivers/i2c/chips/adm1026.c linux-2.6.12-rc4a/drivers/i2c/chips/adm1026.c
--- linux-2.6.12-rc4/drivers/i2c/chips/adm1026.c	2005-05-12 09:47:33.000000000 +1000
+++ linux-2.6.12-rc4a/drivers/i2c/chips/adm1026.c	2005-05-12 10:23:49.000000000 +1000
@@ -1267,8 +1267,9 @@
 	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)
 {
@@ -1708,7 +1709,9 @@
 	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);

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid, take 3

[Grant Coady]

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.

Rediff'd to 2.6.12-rc4 as requested, take 2 completely bogus, sorry.

--Grant.


Signed-off-by: Grant Coady <gcoady@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 -Nru linux-2.6.12-rc4/Documentation/feature-removal-schedule.txt linux-2.6.12-rc4a/Documentation/feature-removal-schedule.txt
--- linux-2.6.12-rc4/Documentation/feature-removal-schedule.txt	2005-05-12 09:47:29.000000000 +1000
+++ linux-2.6.12-rc4a/Documentation/feature-removal-schedule.txt	2005-05-12 10:26:23.000000000 +1000
@@ -63,3 +63,13 @@
 	people, who might be using implementations that I am not aware
 	of, to adjust to this upcoming change.
 Who:	Paul E. McKenney <paulmck@us.ibm.com>
+
+---------------------------
+
+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@gmail.com>
+
diff -X dontdiff -Nru linux-2.6.12-rc4/drivers/i2c/chips/adm1025.c linux-2.6.12-rc4a/drivers/i2c/chips/adm1025.c
--- linux-2.6.12-rc4/drivers/i2c/chips/adm1025.c	2005-05-12 09:47:33.000000000 +1000
+++ linux-2.6.12-rc4a/drivers/i2c/chips/adm1025.c	2005-05-12 10:23:49.000000000 +1000
@@ -287,7 +287,9 @@
 	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)
 {
@@ -437,7 +439,9 @@
 	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 -Nru linux-2.6.12-rc4/drivers/i2c/chips/adm1026.c linux-2.6.12-rc4a/drivers/i2c/chips/adm1026.c
--- linux-2.6.12-rc4/drivers/i2c/chips/adm1026.c	2005-05-12 09:47:33.000000000 +1000
+++ linux-2.6.12-rc4a/drivers/i2c/chips/adm1026.c	2005-05-12 10:23:49.000000000 +1000
@@ -1267,8 +1267,9 @@
 	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)
 {
@@ -1708,7 +1709,9 @@
 	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);

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid, take 3

[Jean Delvare]

Hi Grant,

> 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.
> 
> Rediff'd to 2.6.12-rc4 as requested, take 2 completely bogus, sorry.

This one works for me. Thanks.

-- 
Jean Delvare

[PATCH 2.6] I2C: sysfs names: rename to cpu0_vid, take 3

[Grant Coady]

Sorry about duplication, sleeping in my ISP's server for two days:(
--Grant
On Thu, 12 May 2005 10:32:58 +1000, Grant Coady <grant_lkml@dodo.com.au> wrote: