projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regulator: of: Add regulator desc param to of_get_regulator_init_data()
[linux-2.6-block.git]
/
drivers
/
regulator
/
arizona-micsupp.c
diff --git
a/drivers/regulator/arizona-micsupp.c
b/drivers/regulator/arizona-micsupp.c
index ce9aca5f8ee73b5c114b28f41a464d9279c191b9..c313ef4c3a2f885b0a894f4c50e0204f691cf66c 100644
(file)
--- a/
drivers/regulator/arizona-micsupp.c
+++ b/
drivers/regulator/arizona-micsupp.c
@@
-198,7
+198,8
@@
static const struct regulator_init_data arizona_micsupp_ext_default = {
};
static int arizona_micsupp_of_get_pdata(struct arizona *arizona,
};
static int arizona_micsupp_of_get_pdata(struct arizona *arizona,
- struct regulator_config *config)
+ struct regulator_config *config,
+ const struct regulator_desc *desc)
{
struct arizona_pdata *pdata = &arizona->pdata;
struct arizona_micsupp *micsupp = config->driver_data;
{
struct arizona_pdata *pdata = &arizona->pdata;
struct arizona_micsupp *micsupp = config->driver_data;
@@
-210,7
+211,7
@@
static int arizona_micsupp_of_get_pdata(struct arizona *arizona,
if (np) {
config->of_node = np;
if (np) {
config->of_node = np;
- init_data = of_get_regulator_init_data(arizona->dev, np);
+ init_data = of_get_regulator_init_data(arizona->dev, np
, desc
);
if (init_data) {
init_data->consumer_supplies = &micsupp->supply;
if (init_data) {
init_data->consumer_supplies = &micsupp->supply;
@@
-264,7
+265,8
@@
static int arizona_micsupp_probe(struct platform_device *pdev)
if (IS_ENABLED(CONFIG_OF)) {
if (!dev_get_platdata(arizona->dev)) {
if (IS_ENABLED(CONFIG_OF)) {
if (!dev_get_platdata(arizona->dev)) {
- ret = arizona_micsupp_of_get_pdata(arizona, &config);
+ ret = arizona_micsupp_of_get_pdata(arizona, &config,
+ desc);
if (ret < 0)
return ret;
}
if (ret < 0)
return ret;
}