Commit a435e180 authored by abdoulaye berthe's avatar abdoulaye berthe Committed by Linus Walleij

gpio: bt8xx: use devm function for memory allocation

Signed-off-by: default avatarabdoulaye berthe <berthe.ab@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent cdf86cd2
...@@ -178,7 +178,7 @@ static int bt8xxgpio_probe(struct pci_dev *dev, ...@@ -178,7 +178,7 @@ static int bt8xxgpio_probe(struct pci_dev *dev,
struct bt8xxgpio *bg; struct bt8xxgpio *bg;
int err; int err;
bg = kzalloc(sizeof(*bg), GFP_KERNEL); bg = devm_kzalloc(&dev->dev, sizeof(struct bt8xxgpio), GFP_KERNEL);
if (!bg) if (!bg)
return -ENOMEM; return -ENOMEM;
...@@ -188,9 +188,9 @@ static int bt8xxgpio_probe(struct pci_dev *dev, ...@@ -188,9 +188,9 @@ static int bt8xxgpio_probe(struct pci_dev *dev,
err = pci_enable_device(dev); err = pci_enable_device(dev);
if (err) { if (err) {
printk(KERN_ERR "bt8xxgpio: Can't enable device.\n"); printk(KERN_ERR "bt8xxgpio: Can't enable device.\n");
goto err_freebg; return err;
} }
if (!request_mem_region(pci_resource_start(dev, 0), if (!devm_request_mem_region(&dev->dev, pci_resource_start(dev, 0),
pci_resource_len(dev, 0), pci_resource_len(dev, 0),
"bt8xxgpio")) { "bt8xxgpio")) {
printk(KERN_WARNING "bt8xxgpio: Can't request iomem (0x%llx).\n", printk(KERN_WARNING "bt8xxgpio: Can't request iomem (0x%llx).\n",
...@@ -201,11 +201,11 @@ static int bt8xxgpio_probe(struct pci_dev *dev, ...@@ -201,11 +201,11 @@ static int bt8xxgpio_probe(struct pci_dev *dev,
pci_set_master(dev); pci_set_master(dev);
pci_set_drvdata(dev, bg); pci_set_drvdata(dev, bg);
bg->mmio = ioremap(pci_resource_start(dev, 0), 0x1000); bg->mmio = devm_ioremap(&dev->dev, pci_resource_start(dev, 0), 0x1000);
if (!bg->mmio) { if (!bg->mmio) {
printk(KERN_ERR "bt8xxgpio: ioremap() failed\n"); printk(KERN_ERR "bt8xxgpio: ioremap() failed\n");
err = -EIO; err = -EIO;
goto err_release_mem; goto err_disable;
} }
/* Disable interrupts */ /* Disable interrupts */
...@@ -220,18 +220,13 @@ static int bt8xxgpio_probe(struct pci_dev *dev, ...@@ -220,18 +220,13 @@ static int bt8xxgpio_probe(struct pci_dev *dev,
err = gpiochip_add(&bg->gpio); err = gpiochip_add(&bg->gpio);
if (err) { if (err) {
printk(KERN_ERR "bt8xxgpio: Failed to register GPIOs\n"); printk(KERN_ERR "bt8xxgpio: Failed to register GPIOs\n");
goto err_release_mem; goto err_disable;
} }
return 0; return 0;
err_release_mem:
release_mem_region(pci_resource_start(dev, 0),
pci_resource_len(dev, 0));
err_disable: err_disable:
pci_disable_device(dev); pci_disable_device(dev);
err_freebg:
kfree(bg);
return err; return err;
} }
...@@ -250,8 +245,6 @@ static void bt8xxgpio_remove(struct pci_dev *pdev) ...@@ -250,8 +245,6 @@ static void bt8xxgpio_remove(struct pci_dev *pdev)
release_mem_region(pci_resource_start(pdev, 0), release_mem_region(pci_resource_start(pdev, 0),
pci_resource_len(pdev, 0)); pci_resource_len(pdev, 0));
pci_disable_device(pdev); pci_disable_device(pdev);
kfree(bg);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment