diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2022-08-04 11:41:59 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-08-04 11:41:59 -0500 |
| commit | 085c2d6739ce4b38984a93997765dfc4ca77ce19 (patch) | |
| tree | 3b27a1d455ae0ac7321315aecb0c3abbc136d8e5 | |
| parent | 3aa321dc0afc6372384bafd336439ac60fad1a90 (diff) | |
| parent | aa195350cdc8e93a890c56d0999b17c441b60b97 (diff) | |
| download | idmapping-085c2d6739ce4b38984a93997765dfc4ca77ce19.tar.gz | |
Merge branch 'pci/ctrl/switchtec'
- Prefer ida_alloc()/free() over ida_simple_get()/remove() (Ke Liu)
* pci/ctrl/switchtec:
PCI: switchtec: Prefer ida_alloc()/free() over ida_simple_get()/remove()
| -rw-r--r-- | drivers/pci/switch/switchtec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index c36c1238c604a2..75be4fe2250905 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -1376,8 +1376,7 @@ static struct switchtec_dev *stdev_create(struct pci_dev *pdev) dev->groups = switchtec_device_groups; dev->release = stdev_release; - minor = ida_simple_get(&switchtec_minor_ida, 0, 0, - GFP_KERNEL); + minor = ida_alloc(&switchtec_minor_ida, GFP_KERNEL); if (minor < 0) { rc = minor; goto err_put; @@ -1692,7 +1691,7 @@ static int switchtec_pci_probe(struct pci_dev *pdev, err_devadd: stdev_kill(stdev); err_put: - ida_simple_remove(&switchtec_minor_ida, MINOR(stdev->dev.devt)); + ida_free(&switchtec_minor_ida, MINOR(stdev->dev.devt)); put_device(&stdev->dev); return rc; } @@ -1704,7 +1703,7 @@ static void switchtec_pci_remove(struct pci_dev *pdev) pci_set_drvdata(pdev, NULL); cdev_device_del(&stdev->cdev, &stdev->dev); - ida_simple_remove(&switchtec_minor_ida, MINOR(stdev->dev.devt)); + ida_free(&switchtec_minor_ida, MINOR(stdev->dev.devt)); dev_info(&stdev->dev, "unregistered.\n"); stdev_kill(stdev); put_device(&stdev->dev); |