| Message ID | 1488783873-2614-17-git-send-email-logang@deltatee.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 06, 2017 at 12:04:32AM -0700, Logan Gunthorpe wrote: > Very straightforward conversion to device_add_cdev. Drop cdev_add and > device_add and use cdev_device_add. > > Signed-off-by: Logan Gunthorpe <logang@deltatee.com> > --- > drivers/pci/switch/switchtec.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) As this file isn't in 4.11-rc1, I can't take this patch, but I took all of the others. You should resend this to Bjorn after 4.12-rc1 is out. thanks, greg k-h
On 16/03/17 02:42 AM, Greg Kroah-Hartman wrote: > As this file isn't in 4.11-rc1, I can't take this patch, but I took all > of the others. You should resend this to Bjorn after 4.12-rc1 is out. Yup, I expected this. I'll keep an eye out and make sure it gets in when the time comes. Thanks, Logan
diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index 1f045c9..e27fd29 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -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");
Very straightforward conversion to device_add_cdev. Drop cdev_add and device_add and use cdev_device_add. Signed-off-by: Logan Gunthorpe <logang@deltatee.com> --- drivers/pci/switch/switchtec.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)