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

Commit 587cea27 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Mark Brown
Browse files

regulator: core: convert class code to use dev_groups 



The dev_attrs field of struct class is going away soon, dev_groups
should be used instead.  This converts the regulator class code to use
the correct field.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 070260f0

drivers/regulator/core.c

+16 −12
Original line number Diff line number Diff line
@@ -323,13 +323,14 @@ static ssize_t regulator_uA_show(struct device *dev, 
}

static DEVICE_ATTR(microamps, 0444, regulator_uA_show, NULL);



static ssize_t regulator_name_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

static ssize_t name_show(struct device *dev, struct device_attribute *attr,

			 char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);



	return sprintf(buf, "%s\n", rdev_get_name(rdev));

}

static DEVICE_ATTR_RO(name);



static ssize_t regulator_print_opmode(char *buf, int mode)

{
@@ -489,15 +490,16 @@ static ssize_t regulator_total_uA_show(struct device *dev, 
}

static DEVICE_ATTR(requested_microamps, 0444, regulator_total_uA_show, NULL);



static ssize_t regulator_num_users_show(struct device *dev,

				      struct device_attribute *attr, char *buf)

static ssize_t num_users_show(struct device *dev, struct device_attribute *attr,

			      char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);

	return sprintf(buf, "%d\n", rdev->use_count);

}

static DEVICE_ATTR_RO(num_users);



static ssize_t regulator_type_show(struct device *dev,

				  struct device_attribute *attr, char *buf)

static ssize_t type_show(struct device *dev, struct device_attribute *attr,

			 char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -509,6 +511,7 @@ static ssize_t regulator_type_show(struct device *dev, 
	}

	return sprintf(buf, "unknown\n");

}

static DEVICE_ATTR_RO(type);



static ssize_t regulator_suspend_mem_uV_show(struct device *dev,

				struct device_attribute *attr, char *buf)
@@ -632,12 +635,13 @@ static DEVICE_ATTR(bypass, 0444, 
 * These are the only attributes are present for all regulators.

 * Other attributes are a function of regulator functionality.

 */

static struct device_attribute regulator_dev_attrs[] = {

	__ATTR(name, 0444, regulator_name_show, NULL),

	__ATTR(num_users, 0444, regulator_num_users_show, NULL),

	__ATTR(type, 0444, regulator_type_show, NULL),

	__ATTR_NULL,

static struct attribute *regulator_dev_attrs[] = {

	&dev_attr_name.attr,

	&dev_attr_num_users.attr,

	&dev_attr_type.attr,

	NULL,

};

ATTRIBUTE_GROUPS(regulator_dev);



static void regulator_dev_release(struct device *dev)

{
@@ -648,7 +652,7 @@ static void regulator_dev_release(struct device *dev) 
static struct class regulator_class = {

	.name = "regulator",

	.dev_release = regulator_dev_release,

	.dev_attrs = regulator_dev_attrs,

	.dev_groups = regulator_dev_groups,

};



/* Calculate the new optimum regulator operating mode based on the new total