korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 07:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

PCI: switchtec: Prefer ida_alloc()/free() over ida_simple_get()/remove()

Browse Source 
Use ida_alloc() and ida_free() instead of deprecated ida_simple_get() and
ida_simple_remove().

Link: https://lore.kernel.org/r/20220602071115.3833935-1-liuke94@huawei.com
Signed-off-by: Ke Liu <liuke94@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Logan Gunthorpe <logang@deltatee.com>
This commit is contained in:
Ke Liu 2022-06-02 07:11:15 +00:00 committed by Bjorn Helgaas
parent f2906aa863
commit aa195350cd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/pci/switch/switchtec.c
View File

@ -1376,8 +1376,7 @@ static struct switchtec_dev *stdev_create(struct pci_dev *pdev)
dev->groups = switchtec_device_groups; dev->groups = switchtec_device_groups;
dev->release = stdev_release; dev->release = stdev_release;
minor = ida_simple_get(&switchtec_minor_ida, 0, 0, minor = ida_alloc(&switchtec_minor_ida, GFP_KERNEL);
GFP_KERNEL);
if (minor < 0) { if (minor < 0) {
rc = minor; rc = minor;
goto err_put; goto err_put;
@ -1692,7 +1691,7 @@ static int switchtec_pci_probe(struct pci_dev *pdev,
err_devadd: err_devadd:
stdev_kill(stdev); stdev_kill(stdev);
err_put: 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); put_device(&stdev->dev);
return rc; return rc;
} }
@ -1704,7 +1703,7 @@ static void switchtec_pci_remove(struct pci_dev *pdev)
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
cdev_device_del(&stdev->cdev, &stdev->dev); 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"); dev_info(&stdev->dev, "unregistered.\n");
stdev_kill(stdev); stdev_kill(stdev);
put_device(&stdev->dev); put_device(&stdev->dev);