I2C: sysfs names: rename to cpu0_vid
PATCH 1/1 I2C: sysfs names: rename to cpu0_vid
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
--- adm1025.c | 4 ++-- adm1026.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/i2c/chips/adm1025.c +2 -2
@@ -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 */
drivers/i2c/chips/adm1026.c +2 -2
@@ -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 1/1 I2C: sysfs names: rename to cpu0_vid
Quoted 9 lines · Jean Delvare
Hi Grant,
Quoted 2 lines
This small patch changes two drivers, adm1025 and adm1026, to report vid as
cpu0_vidsysfs 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 1/1 I2C: sysfs names: rename to cpu0_vid
In reply to Grant CoadyHi Grant,
Quoted 2 lines
This small patch changes two drivers, adm1025 and adm1026, to report vid as
cpu0_vidsysfs 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,
Signature · 1 line
Jean Delvare
PATCH 1/1 I2C: sysfs names: rename to cpu0_vid
In reply to Grant CoadyQuoted 6 lines · Jean Delvare
Quoted 4 lines
Quoted 2 lines
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 1/1 I2C: sysfs names: rename to cpu0_vid
In reply to Grant CoadyHi Greg,
Quoted 4 lines
Quoted 1 line
Hmm, 6 months after the original change maybe?
Just be sure to document it in
Documentation/feature-removal-schedule.txtand 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 1/1 I2C: sysfs names: rename to cpu0_vid, take 2
In reply to Grant CoadyHi 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.
--- 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(-)
Documentation/feature-removal-schedule.txt +10 -0
@@ -71,3 +71,13 @@ When: April 2006 Files: kernel/panic.c Why: No modular usage in the kernel. Who: Adrian Bunk <[email protected]> + +--------------------------- + +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 <[email protected]> +
drivers/i2c/chips/adm1025.c +4 -0
@@ -286,7 +286,9 @@ static ssize_t show_vid(struct device *dstruct 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_adadevice_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 */
drivers/i2c/chips/adm1026.c +4 -1
@@ -1266,8 +1266,9 @@ static ssize_t show_vid_reg(struct devicstruct 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 *adevice_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 1/1 I2C: sysfs names: rename to cpu0_vid
In reply to Grant CoadyQuoted 7 lines · Jean Delvare
Hi Grant,
Quoted 2 lines
This small patch changes two drivers, adm1025 and adm1026, to report vid as
cpu0_vidsysfs 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 :)
Quoted 2 lines
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 1/1 I2C: sysfs names: rename to cpu0_vid
In reply to Grant CoadyHi Grant,
Quoted 4 lines
Oops, forgot that aspect. I need to change adm9240 in libsensors too 'cos I renamed
analog_out, does it needchassis_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.
Quoted 4 lines
Quoted 2 lines
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 1/1 I2C: sysfs names: rename to cpu0_vid
In reply to Grant CoadyQuoted 11 lines · Jean Delvare
Hi Greg,
Quoted 4 lines
Quoted 1 line
Hmm, 6 months after the original change maybe?
Just be sure to document it in
Documentation/feature-removal-schedule.txtand 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 1/1 I2C: sysfs names: rename to cpu0_vid, take 2
In reply to Grant CoadyHi Grant,
Quoted 5 lines
This small patch changes two drivers, adm1025 and adm1026, to report vid as
cpu0_vidsysfs 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,
Signature · 1 line
Jean Delvare
PATCH 1/1 I2C: sysfs names: rename to cpu0_vid, take 2
In reply to Grant CoadyQuoted 5 lines · Grant Coady
Quoted 3 lines · Jean Delvare
Quoted 3 lines
This small patch changes two drivers, adm1025 and adm1026, to report vid as
cpu0_vidsysfs name as used by the other drivers.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
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.txtpatch 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 1/1 I2C: sysfs names: rename to cpu0_vid, take 3
In reply to Grant CoadyHi Grant,
Quoted 7 lines
This small patch changes two drivers, adm1025 and adm1026, to report vid as
cpu0_vidsysfs 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.
Signature · 1 line
Jean Delvare
PATCH 1/1 I2C: sysfs names: rename to cpu0_vid, take 3
In reply to Grant CoadySorry about duplication, sleeping in my ISP's server for two days:( --Grant
On Thu, 12 May 2005 10:32:58 +1000, Grant Coady <[email protected]> wrote:
PATCH 1/1 I2C: sysfs names: rename to cpu0_vid, take 2
In reply to Grant CoadyQuoted 8 lines · Jean Delvare
Quoted 5 lines
This small patch changes two drivers, adm1025 and adm1026, to report vid as
cpu0_vidsysfs 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.
--- adm1025.c | 4 ++++ adm1026.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/i2c/chips/adm1025.c +4 -0
@@ -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 */
drivers/i2c/chips/adm1026.c +4 -1
@@ -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 1/1 I2C: sysfs names: rename to cpu0_vid, take 3
In reply to Grant CoadyHi 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.
--- 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(-)
Documentation/feature-removal-schedule.txt +10 -0
@@ -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 <[email protected]> + +--------------------------- + +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 <[email protected]> +
drivers/i2c/chips/adm1025.c +4 -0
@@ -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 */
drivers/i2c/chips/adm1026.c +4 -1
@@ -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 1/1 I2C: sysfs names: rename to cpu0_vid, take 3
In reply to Grant CoadyHi 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.
--- 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(-)
Documentation/feature-removal-schedule.txt +10 -0
@@ -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 <[email protected]> + +--------------------------- + +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 <[email protected]> +
drivers/i2c/chips/adm1025.c +4 -0
@@ -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 */
drivers/i2c/chips/adm1026.c +4 -1
@@ -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);