mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
dw-xdata: Remove usage of the deprecated ida_simple_*() API
ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove() functions. This is also less verbose. Link: https://lore.kernel.org/linux-pci/cc01721cec2d416d7bdf47086943b17ef44b7286.1702966181.git.christophe.jaillet@wanadoo.fr Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
This commit is contained in:
parent
130f335630
commit
0171e067d7
@ -333,7 +333,7 @@ static int dw_xdata_pcie_probe(struct pci_dev *pdev,
|
|||||||
|
|
||||||
dw->pdev = pdev;
|
dw->pdev = pdev;
|
||||||
|
|
||||||
id = ida_simple_get(&xdata_ida, 0, 0, GFP_KERNEL);
|
id = ida_alloc(&xdata_ida, GFP_KERNEL);
|
||||||
if (id < 0) {
|
if (id < 0) {
|
||||||
dev_err(dev, "xData: unable to get id\n");
|
dev_err(dev, "xData: unable to get id\n");
|
||||||
return id;
|
return id;
|
||||||
@ -377,7 +377,7 @@ err_kfree_name:
|
|||||||
kfree(dw->misc_dev.name);
|
kfree(dw->misc_dev.name);
|
||||||
|
|
||||||
err_ida_remove:
|
err_ida_remove:
|
||||||
ida_simple_remove(&xdata_ida, id);
|
ida_free(&xdata_ida, id);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
@ -396,7 +396,7 @@ static void dw_xdata_pcie_remove(struct pci_dev *pdev)
|
|||||||
dw_xdata_stop(dw);
|
dw_xdata_stop(dw);
|
||||||
misc_deregister(&dw->misc_dev);
|
misc_deregister(&dw->misc_dev);
|
||||||
kfree(dw->misc_dev.name);
|
kfree(dw->misc_dev.name);
|
||||||
ida_simple_remove(&xdata_ida, id);
|
ida_free(&xdata_ida, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct pci_device_id dw_xdata_pcie_id_table[] = {
|
static const struct pci_device_id dw_xdata_pcie_id_table[] = {
|
||||||
|
Loading…
Reference in New Issue
Block a user