Commit 085c2d67 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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()
parents 3aa321dc aa195350

drivers/pci/switch/switchtec.c

+3 −4
Original line number Diff line number Diff line
@@ -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);