Both *dev and *rdev are only used in .probe, so use local variable instead.
Also remove mpq7920_regulator_register() because it is so trivial and
there is only one caller.
Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/mpq7920.c | 41 ++++++++++++-------------------------
1 file changed, 13 insertions(+), 28 deletions(-)
diff --git a/drivers/regulator/mpq7920.c b/drivers/regulator/mpq7920.c
index 80f3131f0d1b..b133bab514a9 100644
--- a/drivers/regulator/mpq7920.c
+++ b/drivers/regulator/mpq7920.c
@@ -92,9 +92,7 @@ enum mpq7920_regulators {
};
struct mpq7920_regulator_info {
- struct device *dev;
struct regmap *regmap;
- struct regulator_dev *rdev[MPQ7920_MAX_REGULATORS];
struct regulator_desc *rdesc;
};
@@ -262,40 +260,21 @@ static void mpq7920_parse_dt(struct device *dev,
of_node_put(np);
}
-static inline int mpq7920_regulator_register(
- struct mpq7920_regulator_info *info,
- struct regulator_config *config)
-{
- int i;
- struct regulator_desc *rdesc;
-
- for (i = 0; i < MPQ7920_MAX_REGULATORS; i++) {
- rdesc = &info->rdesc[i];
-
- info->rdev[i] = devm_regulator_register(info->dev, rdesc,
- config);
- if (IS_ERR(info->rdev[i]))
- return PTR_ERR(info->rdev[i]);
- }
-
- return 0;
-}
-
static int mpq7920_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct device *dev = &client->dev;
struct mpq7920_regulator_info *info;
struct regulator_config config = { NULL, };
+ struct regulator_dev *rdev;
struct regmap *regmap;
- int ret;
+ int i;
info = devm_kzalloc(dev, sizeof(struct mpq7920_regulator_info),
GFP_KERNEL);
if (!info)
return -ENOMEM;
- info->dev = dev;
info->rdesc = mpq7920_regulators_desc;
regmap = devm_regmap_init_i2c(client, &mpq7920_regmap_config);
if (IS_ERR(regmap)) {
@@ -308,15 +287,21 @@ static int mpq7920_i2c_probe(struct i2c_client *client,
if (client->dev.of_node)
mpq7920_parse_dt(&client->dev, info);
- config.dev = info->dev;
+ config.dev = dev;
config.regmap = regmap;
config.driver_data = info;
- ret = mpq7920_regulator_register(info, &config);
- if (ret < 0)
- dev_err(dev, "Failed to register regulator!\n");
+ for (i = 0; i < MPQ7920_MAX_REGULATORS; i++) {
+ rdev = devm_regulator_register(dev,
+ &mpq7920_regulators_desc[i],
+ &config);
+ if (IS_ERR(rdev)) {
+ dev_err(dev, "Failed to register regulator!\n");
+ return PTR_ERR(rdev);
+ }
+ }
- return ret;
+ return 0;
}
static const struct of_device_id mpq7920_of_match[] = {
--
2.20.1
Use the new .probe_new instead.
Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/mpq7920.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/mpq7920.c b/drivers/regulator/mpq7920.c
index b133bab514a9..54c862edf571 100644
--- a/drivers/regulator/mpq7920.c
+++ b/drivers/regulator/mpq7920.c
@@ -260,8 +260,7 @@ static void mpq7920_parse_dt(struct device *dev,
of_node_put(np);
}
-static int mpq7920_i2c_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int mpq7920_i2c_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
struct mpq7920_regulator_info *info;
@@ -321,7 +320,7 @@ static struct i2c_driver mpq7920_regulator_driver = {
.name = "mpq7920",
.of_match_table = of_match_ptr(mpq7920_of_match),
},
- .probe = mpq7920_i2c_probe,
+ .probe_new = mpq7920_i2c_probe,
.id_table = mpq7920_id,
};
module_i2c_driver(mpq7920_regulator_driver);
--
2.20.1
The patch
regulator: mpq7920: Convert to use .probe_new
has been applied to the regulator tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.6
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From 5b379b2bf87710834ed90d367acb58e652e624af Mon Sep 17 00:00:00 2001
From: Axel Lin <[email protected]>
Date: Tue, 14 Jan 2020 20:44:49 +0800
Subject: [PATCH] regulator: mpq7920: Convert to use .probe_new
Use the new .probe_new instead.
Signed-off-by: Axel Lin <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
---
drivers/regulator/mpq7920.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/mpq7920.c b/drivers/regulator/mpq7920.c
index b133bab514a9..54c862edf571 100644
--- a/drivers/regulator/mpq7920.c
+++ b/drivers/regulator/mpq7920.c
@@ -260,8 +260,7 @@ static void mpq7920_parse_dt(struct device *dev,
of_node_put(np);
}
-static int mpq7920_i2c_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int mpq7920_i2c_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
struct mpq7920_regulator_info *info;
@@ -321,7 +320,7 @@ static struct i2c_driver mpq7920_regulator_driver = {
.name = "mpq7920",
.of_match_table = of_match_ptr(mpq7920_of_match),
},
- .probe = mpq7920_i2c_probe,
+ .probe_new = mpq7920_i2c_probe,
.id_table = mpq7920_id,
};
module_i2c_driver(mpq7920_regulator_driver);
--
2.20.1
The patch
regulator: mpq7920: Remove unneeded fields from struct mpq7920_regulator_info
has been applied to the regulator tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.6
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From 489d6954acabe71d22ba0033fe85822742364915 Mon Sep 17 00:00:00 2001
From: Axel Lin <[email protected]>
Date: Tue, 14 Jan 2020 20:44:48 +0800
Subject: [PATCH] regulator: mpq7920: Remove unneeded fields from struct
mpq7920_regulator_info
Both *dev and *rdev are only used in .probe, so use local variable instead.
Also remove mpq7920_regulator_register() because it is so trivial and
there is only one caller.
Signed-off-by: Axel Lin <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
---
drivers/regulator/mpq7920.c | 41 ++++++++++++-------------------------
1 file changed, 13 insertions(+), 28 deletions(-)
diff --git a/drivers/regulator/mpq7920.c b/drivers/regulator/mpq7920.c
index 80f3131f0d1b..b133bab514a9 100644
--- a/drivers/regulator/mpq7920.c
+++ b/drivers/regulator/mpq7920.c
@@ -92,9 +92,7 @@ enum mpq7920_regulators {
};
struct mpq7920_regulator_info {
- struct device *dev;
struct regmap *regmap;
- struct regulator_dev *rdev[MPQ7920_MAX_REGULATORS];
struct regulator_desc *rdesc;
};
@@ -262,40 +260,21 @@ static void mpq7920_parse_dt(struct device *dev,
of_node_put(np);
}
-static inline int mpq7920_regulator_register(
- struct mpq7920_regulator_info *info,
- struct regulator_config *config)
-{
- int i;
- struct regulator_desc *rdesc;
-
- for (i = 0; i < MPQ7920_MAX_REGULATORS; i++) {
- rdesc = &info->rdesc[i];
-
- info->rdev[i] = devm_regulator_register(info->dev, rdesc,
- config);
- if (IS_ERR(info->rdev[i]))
- return PTR_ERR(info->rdev[i]);
- }
-
- return 0;
-}
-
static int mpq7920_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct device *dev = &client->dev;
struct mpq7920_regulator_info *info;
struct regulator_config config = { NULL, };
+ struct regulator_dev *rdev;
struct regmap *regmap;
- int ret;
+ int i;
info = devm_kzalloc(dev, sizeof(struct mpq7920_regulator_info),
GFP_KERNEL);
if (!info)
return -ENOMEM;
- info->dev = dev;
info->rdesc = mpq7920_regulators_desc;
regmap = devm_regmap_init_i2c(client, &mpq7920_regmap_config);
if (IS_ERR(regmap)) {
@@ -308,15 +287,21 @@ static int mpq7920_i2c_probe(struct i2c_client *client,
if (client->dev.of_node)
mpq7920_parse_dt(&client->dev, info);
- config.dev = info->dev;
+ config.dev = dev;
config.regmap = regmap;
config.driver_data = info;
- ret = mpq7920_regulator_register(info, &config);
- if (ret < 0)
- dev_err(dev, "Failed to register regulator!\n");
+ for (i = 0; i < MPQ7920_MAX_REGULATORS; i++) {
+ rdev = devm_regulator_register(dev,
+ &mpq7920_regulators_desc[i],
+ &config);
+ if (IS_ERR(rdev)) {
+ dev_err(dev, "Failed to register regulator!\n");
+ return PTR_ERR(rdev);
+ }
+ }
- return ret;
+ return 0;
}
static const struct of_device_id mpq7920_of_match[] = {
--
2.20.1