android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: ml-ioh: Convert to use managed functions pcim* and devm_*

Browse Source 
When removing the module, we will get the following flaw:

[   14.204955] remove_proc_entry: removing non-empty directory 'irq/21', leaking at least 'gpio_ml_ioh'
[   14.205827] WARNING: CPU: 0 PID: 305 at fs/proc/generic.c:717 remove_proc_entry+0x389/0x3f0
...
[   14.220613]  ioh_gpio_remove+0xc5/0xe0 [gpio_ml_ioh]
[   14.221075]  pci_device_remove+0x92/0x240

Fix this by using managed functions, this makes the error handling more
simpler.

Fixes: e971ac9a56 ("gpio: ml-ioh: use resource management for irqs")
Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
This commit is contained in:
Zheyu Ma 2022-05-20 10:56:24 +08:00 committed by Bartosz Golaszewski
parent a998ec3d7b
commit 7869b48102
1 changed files with 16 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
drivers/gpio/gpio-ml-ioh.c
View File

@ -409,29 +409,27 @@ static int ioh_gpio_probe(struct pci_dev *pdev,
void *chip_save; void *chip_save;
int irq_base; int irq_base;
ret = pci_enable_device(pdev); ret = pcim_enable_device(pdev);
if (ret) { if (ret) {
dev_err(dev, "%s : pci_enable_device failed", __func__); dev_err(dev, "%s : pcim_enable_device failed", __func__);
goto err_pci_enable; return ret;
} }
ret = pci_request_regions(pdev, KBUILD_MODNAME); ret = pcim_iomap_regions(pdev, BIT(1), KBUILD_MODNAME);
if (ret) { if (ret) {
dev_err(dev, "pci_request_regions failed-%d", ret); dev_err(dev, "pcim_iomap_regions failed-%d", ret);
goto err_request_regions; return ret;
} }
base = pci_iomap(pdev, 1, 0); base = pcim_iomap_table(pdev)[1];
if (!base) { if (!base) {
dev_err(dev, "%s : pci_iomap failed", __func__); dev_err(dev, "%s : pcim_iomap_table failed", __func__);
ret = -ENOMEM; return -ENOMEM;
goto err_iomap;
} }
chip_save = kcalloc(8, sizeof(*chip), GFP_KERNEL); chip_save = devm_kcalloc(dev, 8, sizeof(*chip), GFP_KERNEL);
if (chip_save == NULL) { if (chip_save == NULL) {
ret = -ENOMEM; return -ENOMEM;
goto err_kzalloc;
} }
chip = chip_save; chip = chip_save;
@ -442,10 +440,10 @@ static int ioh_gpio_probe(struct pci_dev *pdev,
chip->ch = i; chip->ch = i;
spin_lock_init(&chip->spinlock); spin_lock_init(&chip->spinlock);
ioh_gpio_setup(chip, num_ports[i]); ioh_gpio_setup(chip, num_ports[i]);
ret = gpiochip_add_data(&chip->gpio, chip); ret = devm_gpiochip_add_data(dev, &chip->gpio, chip);
if (ret) { if (ret) {
dev_err(dev, "IOH gpio: Failed to register GPIO\n"); dev_err(dev, "IOH gpio: Failed to register GPIO\n");
goto err_gpiochip_add; return ret;
} }
} }
@ -456,15 +454,14 @@ static int ioh_gpio_probe(struct pci_dev *pdev,
if (irq_base < 0) { if (irq_base < 0) {
dev_warn(dev, dev_warn(dev,
"ml_ioh_gpio: Failed to get IRQ base num\n"); "ml_ioh_gpio: Failed to get IRQ base num\n");
ret = irq_base; return irq_base;
goto err_gpiochip_add;
} }
chip->irq_base = irq_base; chip->irq_base = irq_base;
ret = ioh_gpio_alloc_generic_chip(chip, ret = ioh_gpio_alloc_generic_chip(chip,
irq_base, num_ports[j]); irq_base, num_ports[j]);
if (ret) if (ret)
goto err_gpiochip_add; return ret;
} }
chip = chip_save; chip = chip_save;
@ -472,52 +469,12 @@ static int ioh_gpio_probe(struct pci_dev *pdev,
IRQF_SHARED, KBUILD_MODNAME, chip); IRQF_SHARED, KBUILD_MODNAME, chip);
if (ret != 0) { if (ret != 0) {
dev_err(dev, "%s request_irq failed\n", __func__); dev_err(dev, "%s request_irq failed\n", __func__);
goto err_gpiochip_add; return ret;
} }
pci_set_drvdata(pdev, chip); pci_set_drvdata(pdev, chip);
return 0; return 0;
err_gpiochip_add:
chip = chip_save;
while (--i >= 0) {
gpiochip_remove(&chip->gpio);
chip++;
}
kfree(chip_save);
err_kzalloc:
pci_iounmap(pdev, base);
err_iomap:
pci_release_regions(pdev);
err_request_regions:
pci_disable_device(pdev);
err_pci_enable:
dev_err(dev, "%s Failed returns %d\n", __func__, ret);
return ret;
}
static void ioh_gpio_remove(struct pci_dev *pdev)
{
int i;
struct ioh_gpio *chip = pci_get_drvdata(pdev);
void *chip_save;
chip_save = chip;
for (i = 0; i < 8; i++, chip++)
gpiochip_remove(&chip->gpio);
chip = chip_save;
pci_iounmap(pdev, chip->base);
pci_release_regions(pdev);
pci_disable_device(pdev);
kfree(chip);
} }
static int __maybe_unused ioh_gpio_suspend(struct device *dev) static int __maybe_unused ioh_gpio_suspend(struct device *dev)
@ -558,7 +515,6 @@ static struct pci_driver ioh_gpio_driver = {
.name = "ml_ioh_gpio", .name = "ml_ioh_gpio",
.id_table = ioh_gpio_pcidev_id, .id_table = ioh_gpio_pcidev_id,
.probe = ioh_gpio_probe, .probe = ioh_gpio_probe,
.remove = ioh_gpio_remove,
.driver = { .driver = {
.pm = &ioh_gpio_pm_ops, .pm = &ioh_gpio_pm_ops,
}, },