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

Commit 68351b58 authored by Jingoo Han's avatar Jingoo Han Committed by John W. Linville
Browse files

wireless: orinoco: 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: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e53c61a0

drivers/net/wireless/orinoco/orinoco_nortel.c

+0 −2
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev, 
	free_irq(pdev->irq, priv);



 fail_irq:

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(priv);



 fail_alloc:
@@ -265,7 +264,6 @@ static void orinoco_nortel_remove_one(struct pci_dev *pdev) 


	orinoco_if_del(priv);

	free_irq(pdev->irq, priv);

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(priv);

	pci_iounmap(pdev, priv->hw.iobase);

	pci_iounmap(pdev, card->attr_io);

drivers/net/wireless/orinoco/orinoco_pci.c

+0 −2
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, 
	free_irq(pdev->irq, priv);



 fail_irq:

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(priv);



 fail_alloc:
@@ -205,7 +204,6 @@ static void orinoco_pci_remove_one(struct pci_dev *pdev) 


	orinoco_if_del(priv);

	free_irq(pdev->irq, priv);

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(priv);

	pci_iounmap(pdev, priv->hw.iobase);

	pci_release_regions(pdev);

drivers/net/wireless/orinoco/orinoco_plx.c

+0 −2
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ static int orinoco_plx_init_one(struct pci_dev *pdev, 
	free_irq(pdev->irq, priv);



 fail_irq:

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(priv);



 fail_alloc:
@@ -301,7 +300,6 @@ static void orinoco_plx_remove_one(struct pci_dev *pdev) 


	orinoco_if_del(priv);

	free_irq(pdev->irq, priv);

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(priv);

	pci_iounmap(pdev, priv->hw.iobase);

	pci_iounmap(pdev, card->attr_io);

drivers/net/wireless/orinoco/orinoco_tmd.c

+0 −2
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev, 
	free_irq(pdev->irq, priv);



 fail_irq:

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(priv);



 fail_alloc:
@@ -195,7 +194,6 @@ static void orinoco_tmd_remove_one(struct pci_dev *pdev) 


	orinoco_if_del(priv);

	free_irq(pdev->irq, priv);

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(priv);

	pci_iounmap(pdev, priv->hw.iobase);

	pci_iounmap(pdev, card->bridge_io);