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

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

wireless: iwlegacy: 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 8d450935

drivers/net/wireless/iwlegacy/3945-mac.c

+0 −2
Original line number Diff line number Diff line
@@ -3811,7 +3811,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
out_pci_release_regions:

	pci_release_regions(pdev);

out_pci_disable_device:

	pci_set_drvdata(pdev, NULL);

	pci_disable_device(pdev);

out_ieee80211_free_hw:

	ieee80211_free_hw(il->hw);
@@ -3888,7 +3887,6 @@ il3945_pci_remove(struct pci_dev *pdev) 
	iounmap(il->hw_base);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);



	il_free_channel_map(il);

	il_free_geos(il);

drivers/net/wireless/iwlegacy/4965-mac.c

+0 −2
Original line number Diff line number Diff line
@@ -6706,7 +6706,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
out_iounmap:

	iounmap(il->hw_base);

out_pci_release_regions:

	pci_set_drvdata(pdev, NULL);

	pci_release_regions(pdev);

out_pci_disable_device:

	pci_disable_device(pdev);
@@ -6787,7 +6786,6 @@ il4965_pci_remove(struct pci_dev *pdev) 
	iounmap(il->hw_base);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);



	il4965_uninit_drv(il);