Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 937df8df authored by Grant Coady's avatar Grant Coady Committed by Greg Kroah-Hartman
Browse files

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



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.

Signed-off-by: default avatarGrant Coady <gcoady@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent abc01922

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -83,3 +83,13 @@ Why: Deprecated in favour of the new ioctl-based rawiso interface, which is 
	more efficient.  You should really be using libraw1394 for raw1394

	access anyway.

Who:	Jody McIntyre <scjody@steamballoon.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>

drivers/i2c/chips/adm1025.c

+4 −0
Original line number Diff line number Diff line
@@ -286,7 +286,9 @@ static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char 
	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, struct device_attribute *attr, char *buf)

{
@@ -436,7 +438,9 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind) 
	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
Original line number Diff line number Diff line
@@ -1224,8 +1224,9 @@ static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, c 
	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, struct device_attribute *attr, char *buf)

{
@@ -1665,7 +1666,9 @@ int adm1026_detect(struct i2c_adapter *adapter, int address, 
	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);