]> git.itanic.dy.fi Git - linux-stable/commitdiff
PCI: vmd: Remove usage of the deprecated ida_simple_xx() API
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sun, 10 Dec 2023 17:50:03 +0000 (18:50 +0100)
committerKrzysztof Wilczyński <kwilczynski@kernel.org>
Wed, 13 Dec 2023 19:23:35 +0000 (19:23 +0000)
ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

This is less verbose.

Link: https://lore.kernel.org/linux-pci/270f25cdc154f3b0309e57b2f6421776752e2170.1702230593.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
drivers/pci/controller/vmd.c

index 94ba61fe1c44110b95c8b70543c0eda0ce553031..00a4264711f1b982df78ff65f08c18a461d13a72 100644 (file)
@@ -984,7 +984,7 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
                return -ENOMEM;
 
        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)
                return vmd->instance;
 
@@ -1026,7 +1026,7 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
        return 0;
 
  out_release_instance:
-       ida_simple_remove(&vmd_instance_ida, vmd->instance);
+       ida_free(&vmd_instance_ida, vmd->instance);
        return err;
 }
 
@@ -1048,7 +1048,7 @@ static void vmd_remove(struct pci_dev *dev)
        vmd_cleanup_srcu(vmd);
        vmd_detach_resources(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)