Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gpio/vt8500: memory cleanup missing

Browse source 
This driver is missing a .remove callback, and the fail path on
probe is incomplete.

If an error occurs in vt8500_add_chips, gpio_base is not unmapped.
The driver is also ignoring the return value from this function so
if a chip fails to register it completes as successful.

Replaced pr_err with dev_err in vt8500_add_chips since the device is
available.

There is also no .remove callback defined so the function is added.

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Tony Prisk 2013-01-18 17:58:22 +13:00 committed by Grant Likely
parent 362432aed5
commit 9f01d30ee1
1 changed files with 51 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
drivers/gpio/gpio-vt8500.c
View file

@ -127,6 +127,12 @@ struct vt8500_gpio_chip {
void __iomem *base; void __iomem *base;
}; };
struct vt8500_data {
struct vt8500_gpio_chip *chip;
void __iomem *iobase;
int num_banks;
};
#define to_vt8500(__chip) container_of(__chip, struct vt8500_gpio_chip, chip) #define to_vt8500(__chip) container_of(__chip, struct vt8500_gpio_chip, chip)
@ -224,19 +230,32 @@ static int vt8500_of_xlate(struct gpio_chip *gc,
static int vt8500_add_chips(struct platform_device *pdev, void __iomem *base, static int vt8500_add_chips(struct platform_device *pdev, void __iomem *base,
const struct vt8500_gpio_data *data) const struct vt8500_gpio_data *data)
{ {
struct vt8500_data *priv;
struct vt8500_gpio_chip *vtchip; struct vt8500_gpio_chip *vtchip;
struct gpio_chip *chip; struct gpio_chip *chip;
int i; int i;
int pin_cnt = 0; int pin_cnt = 0;
vtchip = devm_kzalloc(&pdev->dev, priv = devm_kzalloc(&pdev->dev, sizeof(struct vt8500_data), GFP_KERNEL);
sizeof(struct vt8500_gpio_chip) * data->num_banks, if (!priv) {
GFP_KERNEL); dev_err(&pdev->dev, "failed to allocate memory\n");
if (!vtchip) {
pr_err("%s: failed to allocate chip memory\n", __func__);
return -ENOMEM; return -ENOMEM;
} }
priv->chip = devm_kzalloc(&pdev->dev,
sizeof(struct vt8500_gpio_chip) * data->num_banks,
GFP_KERNEL);
if (!priv->chip) {
dev_err(&pdev->dev, "failed to allocate chip memory\n");
return -ENOMEM;
}
priv->iobase = base;
priv->num_banks = data->num_banks;
platform_set_drvdata(pdev, priv);
vtchip = priv->chip;
for (i = 0; i < data->num_banks; i++) { for (i = 0; i < data->num_banks; i++) {
vtchip[i].base = base; vtchip[i].base = base;
vtchip[i].regs = &data->banks[i]; vtchip[i].regs = &data->banks[i];
@ -273,36 +292,54 @@ static struct of_device_id vt8500_gpio_dt_ids[] = {
static int vt8500_gpio_probe(struct platform_device *pdev) static int vt8500_gpio_probe(struct platform_device *pdev)
{ {
int ret;
void __iomem *gpio_base; void __iomem *gpio_base;
struct device_node *np; struct resource *res;
const struct of_device_id *of_id = const struct of_device_id *of_id =
of_match_device(vt8500_gpio_dt_ids, &pdev->dev); of_match_device(vt8500_gpio_dt_ids, &pdev->dev);
if (!of_id) { if (!of_id) {
dev_err(&pdev->dev, "Failed to find gpio controller\n"); dev_err(&pdev->dev, "No matching driver data\n");
return -ENODEV; return -ENODEV;
} }
np = pdev->dev.of_node; res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!np) { if (!res) {
dev_err(&pdev->dev, "Missing GPIO description in devicetree\n"); dev_err(&pdev->dev, "Unable to get IO resource\n");
return -EFAULT; return -ENODEV;
} }
gpio_base = of_iomap(np, 0); gpio_base = devm_request_and_ioremap(&pdev->dev, res);
if (!gpio_base) { if (!gpio_base) {
dev_err(&pdev->dev, "Unable to map GPIO registers\n"); dev_err(&pdev->dev, "Unable to map GPIO registers\n");
of_node_put(np);
return -ENOMEM; return -ENOMEM;
} }
vt8500_add_chips(pdev, gpio_base, of_id->data); ret = vt8500_add_chips(pdev, gpio_base, of_id->data);
return ret;
}
static int vt8500_gpio_remove(struct platform_device *pdev)
{
int i;
int ret;
struct vt8500_data *priv = platform_get_drvdata(pdev);
struct vt8500_gpio_chip *vtchip = priv->chip;
for (i = 0; i < priv->num_banks; i++) {
ret = gpiochip_remove(&vtchip[i].chip);
if (ret)
dev_warn(&pdev->dev, "gpiochip_remove returned %d\n",
ret);
}
return 0; return 0;
} }
static struct platform_driver vt8500_gpio_driver = { static struct platform_driver vt8500_gpio_driver = {
.probe = vt8500_gpio_probe, .probe = vt8500_gpio_probe,
.remove = vt8500_gpio_remove,
.driver = { .driver = {
.name = "vt8500-gpio", .name = "vt8500-gpio",
.owner = THIS_MODULE, .owner = THIS_MODULE,