leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regulator: slg51000: Remove unneeded regl_pdata from struct slg51000

Browse Source 
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>
This commit is contained in:
Axel Lin 2019-05-24 18:02:47 +08:00 committed by Mark Brown
parent 0a33d4feea
commit 12c574d84c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/regulator/slg51000-regulator.c
View File

@ -35,14 +35,9 @@ enum slg51000_regulators {
SLG51000_MAX_REGULATORS, SLG51000_MAX_REGULATORS,
}; };
struct slg51000_pdata {
struct gpio_desc *ena_gpiod;
};
struct slg51000 { struct slg51000 {
struct device *dev; struct device *dev;
struct regmap *regmap; struct regmap *regmap;
struct slg51000_pdata regl_pdata[SLG51000_MAX_REGULATORS];
struct regulator_desc *rdesc[SLG51000_MAX_REGULATORS]; struct regulator_desc *rdesc[SLG51000_MAX_REGULATORS];
struct regulator_dev *rdev[SLG51000_MAX_REGULATORS]; struct regulator_dev *rdev[SLG51000_MAX_REGULATORS];
struct gpio_desc *cs_gpiod; struct gpio_desc *cs_gpiod;
@ -204,14 +199,14 @@ static int slg51000_of_parse_cb(struct device_node *np,
struct regulator_config *config) struct regulator_config *config)
{ {
struct slg51000 *chip = config->driver_data; 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; enum gpiod_flags gflags = GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE;
rpdata->ena_gpiod = devm_gpiod_get_from_of_node(chip->dev, np, ena_gpiod = devm_gpiod_get_from_of_node(chip->dev, np,
"enable-gpios", 0, "enable-gpios", 0,
gflags, "gpio-en-ldo"); gflags, "gpio-en-ldo");
if (rpdata->ena_gpiod) { if (ena_gpiod) {
config->ena_gpiod = rpdata->ena_gpiod; config->ena_gpiod = ena_gpiod;
devm_gpiod_unhinge(chip->dev, config->ena_gpiod); devm_gpiod_unhinge(chip->dev, config->ena_gpiod);
} }