Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e40cf640 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Bjorn Helgaas
Browse files

switchtec: Use new cdev_device_add() helper function 



Convert from "cdev_add() + device_add()" to cdev_device_add(), and from
"device_del() + cdev_del()" to cdev_device_del().

[bhelgaas: changelog]
Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent c849e551

drivers/pci/switch/switchtec.c

+2 −9
Original line number Diff line number Diff line
@@ -1291,7 +1291,6 @@ static struct switchtec_dev *stdev_create(struct pci_dev *pdev) 
	cdev = &stdev->cdev;

	cdev_init(cdev, &switchtec_fops);

	cdev->owner = THIS_MODULE;

	cdev->kobj.parent = &dev->kobj;



	return stdev;
@@ -1479,11 +1478,7 @@ static int switchtec_pci_probe(struct pci_dev *pdev, 
		  SWITCHTEC_EVENT_EN_IRQ,

		  &stdev->mmio_part_cfg->mrpc_comp_hdr);



	rc = cdev_add(&stdev->cdev, stdev->dev.devt, 1);

	if (rc)

		goto err_put;



	rc = device_add(&stdev->dev);

	rc = cdev_device_add(&stdev->cdev, &stdev->dev);

	if (rc)

		goto err_devadd;
@@ -1492,7 +1487,6 @@ static int switchtec_pci_probe(struct pci_dev *pdev, 
	return 0;



err_devadd:

	cdev_del(&stdev->cdev);

	stdev_kill(stdev);

err_put:

	ida_simple_remove(&switchtec_minor_ida, MINOR(stdev->dev.devt));
@@ -1506,8 +1500,7 @@ static void switchtec_pci_remove(struct pci_dev *pdev) 


	pci_set_drvdata(pdev, NULL);



	device_del(&stdev->dev);

	cdev_del(&stdev->cdev);

	cdev_device_del(&stdev->cdev, &stdev->dev);

	ida_simple_remove(&switchtec_minor_ida, MINOR(stdev->dev.devt));

	dev_info(&stdev->dev, "unregistered.\n");