Jingoo Han
2013-Nov-25 03:23 UTC
[PATCH] virtio: pci: remove unnecessary pci_set_drvdata()
The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han <jg1.han at samsung.com> --- drivers/virtio/virtio_pci.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index a37c699..a416f9b 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -742,7 +742,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev, return 0; out_set_drvdata: - pci_set_drvdata(pci_dev, NULL); pci_iounmap(pci_dev, vp_dev->ioaddr); out_req_regions: pci_release_regions(pci_dev); @@ -760,7 +759,6 @@ static void virtio_pci_remove(struct pci_dev *pci_dev) unregister_virtio_device(&vp_dev->vdev); vp_del_vqs(&vp_dev->vdev); - pci_set_drvdata(pci_dev, NULL); pci_iounmap(pci_dev, vp_dev->ioaddr); pci_release_regions(pci_dev); pci_disable_device(pci_dev); -- 1.7.10.4
Rusty Russell
2013-Dec-01 10:37 UTC
[PATCH] virtio: pci: remove unnecessary pci_set_drvdata()
Jingoo Han <jg1.han at samsung.com> writes:> The driver core clears the driver data to NULL after device_release > or on probe failure. Thus, it is not needed to manually clear the > device driver data to NULL. > > Signed-off-by: Jingoo Han <jg1.han at samsung.com>Applied. Thanks, Rusty.> --- > drivers/virtio/virtio_pci.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c > index a37c699..a416f9b 100644 > --- a/drivers/virtio/virtio_pci.c > +++ b/drivers/virtio/virtio_pci.c > @@ -742,7 +742,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev, > return 0; > > out_set_drvdata: > - pci_set_drvdata(pci_dev, NULL); > pci_iounmap(pci_dev, vp_dev->ioaddr); > out_req_regions: > pci_release_regions(pci_dev); > @@ -760,7 +759,6 @@ static void virtio_pci_remove(struct pci_dev *pci_dev) > unregister_virtio_device(&vp_dev->vdev); > > vp_del_vqs(&vp_dev->vdev); > - pci_set_drvdata(pci_dev, NULL); > pci_iounmap(pci_dev, vp_dev->ioaddr); > pci_release_regions(pci_dev); > pci_disable_device(pci_dev); > -- > 1.7.10.4