From: Jingoo Han Subject: [PATCH 02/15] net: netxen: remove unnecessary pci_set_drvdata() Date: Tue, 22 Oct 2013 13:15:09 +0900 Message-ID: <000801cecedd$4bc55180$e34ff480$%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' , 'Manish Chopra' , 'Sony Chacko' , 'Rajesh Borundia' To: "'David S. Miller'" Return-path: Received: from mailout3.samsung.com ([203.254.224.33]:41361 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751268Ab3JVEPL (ORCPT ); Tue, 22 Oct 2013 00:15:11 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MV100005YFSW7L0@mailout3.samsung.com> for netdev@vger.kernel.org; Tue, 22 Oct 2013 13:15: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/netxen/netxen_nic_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 5ec21c5..3bec8cf 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -1630,7 +1630,6 @@ err_out_free_res: pci_release_regions(pdev); err_out_disable_pdev: - pci_set_drvdata(pdev, NULL); pci_disable_device(pdev); return err; } @@ -1689,7 +1688,6 @@ static void netxen_nic_remove(struct pci_dev *pdev) pci_release_regions(pdev); pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); free_netdev(netdev); } -- 1.7.10.4