From: Jingoo Han Date: Mon, 25 Nov 2013 01:52:33 +0000 (+0900) Subject: wireless: rt2x00: remove unnecessary pci_set_drvdata() X-Git-Tag: Ubuntu-5.0.0-8.9~12182^2~601^2^2~14 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=515adc14cb860f1fb83f48acc6558baec10386f4;p=mirror_ubuntu-disco-kernel.git wireless: rt2x00: 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 Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 25da20e7e1f3..af721831dcbc 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c @@ -156,8 +156,6 @@ exit_release_regions: exit_disable_device: pci_disable_device(pci_dev); - pci_set_drvdata(pci_dev, NULL); - return retval; } EXPORT_SYMBOL_GPL(rt2x00pci_probe); @@ -177,7 +175,6 @@ void rt2x00pci_remove(struct pci_dev *pci_dev) /* * Free the PCI device data. */ - pci_set_drvdata(pci_dev, NULL); pci_disable_device(pci_dev); pci_release_regions(pci_dev); }