asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpio: dwapb: Convert to use resource managed APIs

Browse source 
Use resource managed APIs to simplify the code a bit.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Axel Lin 2014-12-28 15:23:14 +08:00 committed by Linus Walleij
parent 08b89fa20b
commit da9df93e9e
1 changed files with 14 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
drivers/gpio/gpio-dwapb.c
View file

@ -469,15 +469,13 @@ dwapb_gpio_get_pdata_of(struct device *dev)
if (nports == 0) if (nports == 0)
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata) if (!pdata)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
pdata->properties = kcalloc(nports, sizeof(*pp), GFP_KERNEL); pdata->properties = devm_kcalloc(dev, nports, sizeof(*pp), GFP_KERNEL);
if (!pdata->properties) { if (!pdata->properties)
kfree(pdata);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
}
pdata->nports = nports; pdata->nports = nports;
@ -490,8 +488,6 @@ dwapb_gpio_get_pdata_of(struct device *dev)
pp->idx >= DWAPB_MAX_PORTS) { pp->idx >= DWAPB_MAX_PORTS) {
dev_err(dev, "missing/invalid port index for %s\n", dev_err(dev, "missing/invalid port index for %s\n",
port_np->full_name); port_np->full_name);
kfree(pdata->properties);
kfree(pdata);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
@ -523,15 +519,6 @@ dwapb_gpio_get_pdata_of(struct device *dev)
return pdata; return pdata;
} }
static inline void dwapb_free_pdata_of(struct dwapb_platform_data *pdata)
{
if (!IS_ENABLED(CONFIG_OF_GPIO) || !pdata)
return;
kfree(pdata->properties);
kfree(pdata);
}
static int dwapb_gpio_probe(struct platform_device *pdev) static int dwapb_gpio_probe(struct platform_device *pdev)
{ {
unsigned int i; unsigned int i;
@ -540,40 +527,32 @@ static int dwapb_gpio_probe(struct platform_device *pdev)
int err; int err;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct dwapb_platform_data *pdata = dev_get_platdata(dev); struct dwapb_platform_data *pdata = dev_get_platdata(dev);
bool is_pdata_alloc = !pdata;
if (is_pdata_alloc) { if (!pdata) {
pdata = dwapb_gpio_get_pdata_of(dev); pdata = dwapb_gpio_get_pdata_of(dev);
if (IS_ERR(pdata)) if (IS_ERR(pdata))
return PTR_ERR(pdata); return PTR_ERR(pdata);
} }
if (!pdata->nports) { if (!pdata->nports)
err = -ENODEV; return -ENODEV;
goto out_err;
}
gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL); gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
if (!gpio) { if (!gpio)
err = -ENOMEM; return -ENOMEM;
goto out_err;
}
gpio->dev = &pdev->dev; gpio->dev = &pdev->dev;
gpio->nr_ports = pdata->nports; gpio->nr_ports = pdata->nports;
gpio->ports = devm_kcalloc(&pdev->dev, gpio->nr_ports, gpio->ports = devm_kcalloc(&pdev->dev, gpio->nr_ports,
sizeof(*gpio->ports), GFP_KERNEL); sizeof(*gpio->ports), GFP_KERNEL);
if (!gpio->ports) { if (!gpio->ports)
err = -ENOMEM; return -ENOMEM;
goto out_err;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
gpio->regs = devm_ioremap_resource(&pdev->dev, res); gpio->regs = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(gpio->regs)) { if (IS_ERR(gpio->regs))
err = PTR_ERR(gpio->regs); return PTR_ERR(gpio->regs);
goto out_err;
}
for (i = 0; i < gpio->nr_ports; i++) { for (i = 0; i < gpio->nr_ports; i++) {
err = dwapb_gpio_add_port(gpio, &pdata->properties[i], i); err = dwapb_gpio_add_port(gpio, &pdata->properties[i], i);
@ -582,16 +561,12 @@ static int dwapb_gpio_probe(struct platform_device *pdev)
} }
platform_set_drvdata(pdev, gpio); platform_set_drvdata(pdev, gpio);
goto out_err; return 0;
out_unregister: out_unregister:
dwapb_gpio_unregister(gpio); dwapb_gpio_unregister(gpio);
dwapb_irq_teardown(gpio); dwapb_irq_teardown(gpio);
out_err:
if (is_pdata_alloc)
dwapb_free_pdata_of(pdata);
return err; return err;
} }