Unverified Commit 148096af authored by Maciej Purski's avatar Maciej Purski Committed by Mark Brown
Browse files

regulator: core: Move of_find_regulator_by_node() to of_regulator.c 



As of_find_regulator_by_node() is an of function it should be moved from
core.c to of_regulator.c. It provides better separation of device tree
functions from the core and allows other of_functions in of_regulator.c
to resolve device_node to regulator_dev. This will be useful for
implementation of parsing coupled regulators properties.

Declare of_find_regulator_by_node() function in internal.h as well as
regulator_class and dev_to_rdev(), as they are needed by
of_find_regulator_by_node().

Signed-off-by: default avatarMaciej Purski <m.purski@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0d5c8633

drivers/regulator/core.c

+1 −22
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ static bool has_full_constraints; 


static struct dentry *debugfs_root;



static struct class regulator_class;



/*

 * struct regulator_map

 *
@@ -112,11 +110,6 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, 
					  const char *supply_name);

static void _regulator_put(struct regulator *regulator);



static struct regulator_dev *dev_to_rdev(struct device *dev)

{

	return container_of(dev, struct regulator_dev, dev);

}



static const char *rdev_get_name(struct regulator_dev *rdev)

{

	if (rdev->constraints && rdev->constraints->name)
@@ -1417,20 +1410,6 @@ static void regulator_supply_alias(struct device **dev, const char **supply) 
	}

}



static int of_node_match(struct device *dev, const void *data)

{

	return dev->of_node == data;

}



static struct regulator_dev *of_find_regulator_by_node(struct device_node *np)

{

	struct device *dev;



	dev = class_find_device(&regulator_class, NULL, np, of_node_match);



	return dev ? dev_to_rdev(dev) : NULL;

}



static int regulator_match(struct device *dev, const void *data)

{

	struct regulator_dev *r = dev_to_rdev(dev);
@@ -3918,7 +3897,7 @@ static void regulator_dev_release(struct device *dev) 
	kfree(rdev);

}



static struct class regulator_class = {

struct class regulator_class = {

	.name = "regulator",

	.dev_release = regulator_dev_release,

	.dev_groups = regulator_dev_groups,

drivers/regulator/internal.h

+9 −0
Original line number Diff line number Diff line
@@ -35,6 +35,15 @@ struct regulator { 
	struct dentry *debugfs;

};



extern struct class regulator_class;



static inline struct regulator_dev *dev_to_rdev(struct device *dev)

{

	return container_of(dev, struct regulator_dev, dev);

}



struct regulator_dev *of_find_regulator_by_node(struct device_node *np);



#ifdef CONFIG_OF

struct regulator_init_data *regulator_of_get_init_data(struct device *dev,

			         const struct regulator_desc *desc,

drivers/regulator/of_regulator.c

+14 −0
Original line number Diff line number Diff line
@@ -376,3 +376,17 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev, 


	return init_data;

}



static int of_node_match(struct device *dev, const void *data)

{

	return dev->of_node == data;

}



struct regulator_dev *of_find_regulator_by_node(struct device_node *np)

{

	struct device *dev;



	dev = class_find_device(&regulator_class, NULL, np, of_node_match);



	return dev ? dev_to_rdev(dev) : NULL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE