From: Jingoo Han Date: Tue, 10 Sep 2013 11:28:24 +0000 (+0300) Subject: wireless: iwlwifi: remove unnecessary pci_set_drvdata() X-Git-Tag: Ubuntu-5.2.0-15.16~14566^2~55^2^2~52^2~21 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5d3c2f7d34616072900b0dafbaf58496d1d9bbf6;p=mirror_ubuntu-eoan-kernel.git wireless: iwlwifi: 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 Signed-off-by: Johannes Berg --- diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c index dc02cb9792af..5c5c423aa286 100644 --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c @@ -349,7 +349,6 @@ out_free_drv: iwl_drv_stop(trans_pcie->drv); out_free_trans: iwl_trans_pcie_free(iwl_trans); - pci_set_drvdata(pdev, NULL); return ret; } @@ -360,8 +359,6 @@ static void iwl_pci_remove(struct pci_dev *pdev) iwl_drv_stop(trans_pcie->drv); iwl_trans_pcie_free(trans); - - pci_set_drvdata(pdev, NULL); } #ifdef CONFIG_PM_SLEEP