korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 04:31:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pci/controller/vmd'

Browse Source 
- Use ida_alloc() instead of deprecated ida_simple_get() (Christophe JAILLET)

* pci/controller/vmd:
  PCI: vmd: Remove usage of the deprecated ida_simple_xx() API
This commit is contained in:
Bjorn Helgaas 2024-01-15 12:10:39 -06:00
commit 161d42df9a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pci/controller/vmd.c
View File

@ -984,7 +984,7 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
return -ENOMEM; return -ENOMEM;
vmd->dev = dev; vmd->dev = dev;
vmd->instance = ida_simple_get(&vmd_instance_ida, 0, 0, GFP_KERNEL); vmd->instance = ida_alloc(&vmd_instance_ida, GFP_KERNEL);
if (vmd->instance < 0) if (vmd->instance < 0)
return vmd->instance; return vmd->instance;
@ -1026,7 +1026,7 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
return 0; return 0;
out_release_instance: out_release_instance:
ida_simple_remove(&vmd_instance_ida, vmd->instance); ida_free(&vmd_instance_ida, vmd->instance);
return err; return err;
} }
@ -1048,7 +1048,7 @@ static void vmd_remove(struct pci_dev *dev)
vmd_cleanup_srcu(vmd); vmd_cleanup_srcu(vmd);
vmd_detach_resources(vmd); vmd_detach_resources(vmd);
vmd_remove_irq_domain(vmd); vmd_remove_irq_domain(vmd);
ida_simple_remove(&vmd_instance_ida, vmd->instance); ida_free(&vmd_instance_ida, vmd->instance);
} }
static void vmd_shutdown(struct pci_dev *dev) static void vmd_shutdown(struct pci_dev *dev)