From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jingoo Han Subject: [PATCH 04/15] net: qlcnic: remove unnecessary pci_set_drvdata() Date: Tue, 22 Oct 2013 13:16:08 +0900 Message-ID: <000a01cecedd$6f382d90$4da888b0$%han@samsung.com> References: <000601cecedd$1981e300$4c85a900$%han@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, 'Jingoo Han' , 'Himanshu Madhani' , 'Rajesh Borundia' , 'Shahed Shaikh' , 'Jitendra Kalsaria' , 'Sony Chacko' , 'Sucheta Chakraborty' To: "'David S. Miller'" Return-path: Received: from mailout2.samsung.com ([203.254.224.25]:57527 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751161Ab3JVEQK (ORCPT ); Tue, 22 Oct 2013 00:16:10 -0400 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MV100ANLYI3NTL0@mailout2.samsung.com> for netdev@vger.kernel.org; Tue, 22 Oct 2013 13:16:09 +0900 (KST) In-reply-to: <000601cecedd$1981e300$4c85a900$%han@samsung.com> Content-language: ko Sender: netdev-owner@vger.kernel.org List-ID: 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 --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 0274832..24e6b11 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -2406,7 +2406,6 @@ err_out_free_res: pci_release_regions(pdev); err_out_disable_pdev: - pci_set_drvdata(pdev, NULL); pci_disable_device(pdev); return err; @@ -2482,7 +2481,6 @@ static void qlcnic_remove(struct pci_dev *pdev) pci_disable_pcie_error_reporting(pdev); pci_release_regions(pdev); pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); if (adapter->qlcnic_wq) { destroy_workqueue(adapter->qlcnic_wq); -- 1.7.10.4