summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2019-05-24 13:02:47 +0300
committerMark Brown <broonie@kernel.org>2019-05-24 15:04:49 +0300
commit12c574d84c8e492320a4e75b2c1157f8b61e4092 (patch)
tree8a422a888d3f3640b9a1680b1ebcbff240b24d79
parent0a33d4feea748399c9341ff054c5f29c98393d35 (diff)
downloadlinux-12c574d84c8e492320a4e75b2c1157f8b61e4092.tar.xz
regulator: slg51000: Remove unneeded regl_pdata from struct slg51000
Just use a local variable *ena_gpiod in slg51000_of_parse_cb instead. With this change, the struct slg51000_pdata can be removed. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/regulator/slg51000-regulator.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/regulator/slg51000-regulator.c b/drivers/regulator/slg51000-regulator.c
index a06a18f220e0..04b732991d69 100644
--- a/drivers/regulator/slg51000-regulator.c
+++ b/drivers/regulator/slg51000-regulator.c
@@ -35,14 +35,9 @@ enum slg51000_regulators {
SLG51000_MAX_REGULATORS,
};
-struct slg51000_pdata {
- struct gpio_desc *ena_gpiod;
-};
-
struct slg51000 {
struct device *dev;
struct regmap *regmap;
- struct slg51000_pdata regl_pdata[SLG51000_MAX_REGULATORS];
struct regulator_desc *rdesc[SLG51000_MAX_REGULATORS];
struct regulator_dev *rdev[SLG51000_MAX_REGULATORS];
struct gpio_desc *cs_gpiod;
@@ -204,14 +199,14 @@ static int slg51000_of_parse_cb(struct device_node *np,
struct regulator_config *config)
{
struct slg51000 *chip = config->driver_data;
- struct slg51000_pdata *rpdata = &chip->regl_pdata[desc->id];
+ struct gpio_desc *ena_gpiod;
enum gpiod_flags gflags = GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE;
- rpdata->ena_gpiod = devm_gpiod_get_from_of_node(chip->dev, np,
- "enable-gpios", 0,
- gflags, "gpio-en-ldo");
- if (rpdata->ena_gpiod) {
- config->ena_gpiod = rpdata->ena_gpiod;
+ ena_gpiod = devm_gpiod_get_from_of_node(chip->dev, np,
+ "enable-gpios", 0,
+ gflags, "gpio-en-ldo");
+ if (ena_gpiod) {
+ config->ena_gpiod = ena_gpiod;
devm_gpiod_unhinge(chip->dev, config->ena_gpiod);
}