From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jingoo Han Subject: [PATCH 15/52] net: enic: remove unnecessary pci_set_drvdata() Date: Wed, 11 Sep 2013 16:36:35 +0900 Message-ID: <005901ceaec1$a5898f60$f09cae20$%han@samsung.com> References: <004a01ceaebf$43f920f0$cbeb62d0$%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' , 'Christian Benvenuti' , 'Sujith Sankar' , 'Govindarajulu Varadarajan' , 'Neel Patel' , 'Nishank Trivedi' To: "'David S. Miller'" Return-path: Received: from mailout1.samsung.com ([203.254.224.24]:27991 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750936Ab3IKHgi (ORCPT ); Wed, 11 Sep 2013 03:36:38 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MSY00I2UAH12410@mailout1.samsung.com> for netdev@vger.kernel.org; Wed, 11 Sep 2013 16:36:37 +0900 (KST) In-reply-to: <004a01ceaebf$43f920f0$cbeb62d0$%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/cisco/enic/enic_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 7b756cf9..ff78dfa 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -2309,7 +2309,6 @@ err_out_release_regions: err_out_disable_device: pci_disable_device(pdev); err_out_free_netdev: - pci_set_drvdata(pdev, NULL); free_netdev(netdev); return err; @@ -2338,7 +2337,6 @@ static void enic_remove(struct pci_dev *pdev) enic_iounmap(enic); pci_release_regions(pdev); pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); free_netdev(netdev); } } -- 1.7.10.4