openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

regulator: gpio: Simplify probe path 

Use devm_* managed device resources and create a local
struct device *dev variable to simplify the code inside
probe().

Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Linus Walleij 2019-01-29 11:31:55 +01:00 committed by Mark Brown
parent 01dc79cd6f
commit d162d04103
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/regulator/gpio-regulator.c
View File

@ -228,37 +228,38 @@ static struct regulator_ops gpio_regulator_current_ops = {
static int gpio_regulator_probe(struct platform_device *pdev) static int gpio_regulator_probe(struct platform_device *pdev)
{ {
struct gpio_regulator_config *config = dev_get_platdata(&pdev->dev); struct device *dev = &pdev->dev;
struct device_node *np = pdev->dev.of_node; struct gpio_regulator_config *config = dev_get_platdata(dev);
struct device_node *np = dev->of_node;
struct gpio_regulator_data *drvdata; struct gpio_regulator_data *drvdata;
struct regulator_config cfg = { }; struct regulator_config cfg = { };
enum gpiod_flags gflags; enum gpiod_flags gflags;
int ptr, ret, state, i; int ptr, ret, state, i;
drvdata = devm_kzalloc(&pdev->dev, sizeof(struct gpio_regulator_data), drvdata = devm_kzalloc(dev, sizeof(struct gpio_regulator_data),
GFP_KERNEL); GFP_KERNEL);
if (drvdata == NULL) if (drvdata == NULL)
return -ENOMEM; return -ENOMEM;
if (np) { if (np) {
config = of_get_gpio_regulator_config(&pdev->dev, np, config = of_get_gpio_regulator_config(dev, np,
&drvdata->desc); &drvdata->desc);
if (IS_ERR(config)) if (IS_ERR(config))
return PTR_ERR(config); return PTR_ERR(config);
} }
drvdata->desc.name = kstrdup(config->supply_name, GFP_KERNEL); drvdata->desc.name = devm_kstrdup(dev, config->supply_name, GFP_KERNEL);
if (drvdata->desc.name == NULL) { if (drvdata->desc.name == NULL) {
dev_err(&pdev->dev, "Failed to allocate supply name\n"); dev_err(dev, "Failed to allocate supply name\n");
return -ENOMEM; return -ENOMEM;
} }
drvdata->gpiods = devm_kzalloc(&pdev->dev, sizeof(struct gpio_desc *), drvdata->gpiods = devm_kzalloc(dev, sizeof(struct gpio_desc *),
GFP_KERNEL); GFP_KERNEL);
if (!drvdata->gpiods) if (!drvdata->gpiods)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < config->ngpios; i++) { for (i = 0; i < config->ngpios; i++) {
drvdata->gpiods[i] = devm_gpiod_get_index(&pdev->dev, drvdata->gpiods[i] = devm_gpiod_get_index(dev,
NULL, NULL,
i, i,
config->gflags[i]); config->gflags[i]);
@ -269,14 +270,14 @@ static int gpio_regulator_probe(struct platform_device *pdev)
} }
drvdata->nr_gpios = config->ngpios; drvdata->nr_gpios = config->ngpios;
drvdata->states = kmemdup(config->states, drvdata->states = devm_kmemdup(dev,
config->nr_states * config->states,
sizeof(struct gpio_regulator_state), config->nr_states *
GFP_KERNEL); sizeof(struct gpio_regulator_state),
GFP_KERNEL);
if (drvdata->states == NULL) { if (drvdata->states == NULL) {
dev_err(&pdev->dev, "Failed to allocate state data\n"); dev_err(dev, "Failed to allocate state data\n");
ret = -ENOMEM; return -ENOMEM;
goto err_name;
} }
drvdata->nr_states = config->nr_states; drvdata->nr_states = config->nr_states;
@ -295,9 +296,8 @@ static int gpio_regulator_probe(struct platform_device *pdev)
drvdata->desc.ops = &gpio_regulator_current_ops; drvdata->desc.ops = &gpio_regulator_current_ops;
break; break;
default: default:
dev_err(&pdev->dev, "No regulator type set\n"); dev_err(dev, "No regulator type set\n");
ret = -EINVAL; return -EINVAL;
goto err_memstate;
} }
/* build initial state from gpio init data. */ /* build initial state from gpio init data. */
@ -308,7 +308,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)
} }
drvdata->state = state; drvdata->state = state;
cfg.dev = &pdev->dev; cfg.dev = dev;
cfg.init_data = config->init_data; cfg.init_data = config->init_data;
cfg.driver_data = drvdata; cfg.driver_data = drvdata;
cfg.of_node = np; cfg.of_node = np;
@ -322,28 +322,20 @@ static int gpio_regulator_probe(struct platform_device *pdev)
else else
gflags = GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE; gflags = GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE;
cfg.ena_gpiod = gpiod_get_optional(&pdev->dev, "enable", gflags); cfg.ena_gpiod = gpiod_get_optional(dev, "enable", gflags);
if (IS_ERR(cfg.ena_gpiod)) { if (IS_ERR(cfg.ena_gpiod))
ret = PTR_ERR(cfg.ena_gpiod); return PTR_ERR(cfg.ena_gpiod);
goto err_memstate;
}
drvdata->dev = regulator_register(&drvdata->desc, &cfg); drvdata->dev = regulator_register(&drvdata->desc, &cfg);
if (IS_ERR(drvdata->dev)) { if (IS_ERR(drvdata->dev)) {
ret = PTR_ERR(drvdata->dev); ret = PTR_ERR(drvdata->dev);
dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret); dev_err(dev, "Failed to register regulator: %d\n", ret);
goto err_memstate; return ret;
} }
platform_set_drvdata(pdev, drvdata); platform_set_drvdata(pdev, drvdata);
return 0; return 0;
err_memstate:
kfree(drvdata->states);
err_name:
kfree(drvdata->desc.name);
return ret;
} }
static int gpio_regulator_remove(struct platform_device *pdev) static int gpio_regulator_remove(struct platform_device *pdev)
@ -351,8 +343,6 @@ static int gpio_regulator_remove(struct platform_device *pdev)
struct gpio_regulator_data *drvdata = platform_get_drvdata(pdev); struct gpio_regulator_data *drvdata = platform_get_drvdata(pdev);
regulator_unregister(drvdata->dev); regulator_unregister(drvdata->dev);
kfree(drvdata->states);
kfree(drvdata->desc.name);
return 0; return 0;
} }