From patchwork Mon Oct 21 02:09:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 285067 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6CCA32C0143 for ; Mon, 21 Oct 2013 13:09:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752180Ab3JUCJa (ORCPT ); Sun, 20 Oct 2013 22:09:30 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:35351 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752101Ab3JUCJ3 (ORCPT ); Sun, 20 Oct 2013 22:09:29 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MUZ00AZOXWZD3E0@mailout3.samsung.com> for netdev@vger.kernel.org; Mon, 21 Oct 2013 11:09:27 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id C1.7D.07052.7DC84625; Mon, 21 Oct 2013 11:09:27 +0900 (KST) X-AuditID: cbfee691-b7f866d000001b8c-51-52648cd727fd Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 08.D7.08134.7DC84625; Mon, 21 Oct 2013 11:09:27 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MUZ00MN6XZQAE00@mmp2.samsung.com>; Mon, 21 Oct 2013 11:09:27 +0900 (KST) From: Jingoo Han To: "'David S. Miller'" Cc: netdev@vger.kernel.org, 'Jingoo Han' References: <003801cece02$6abb0160$40310420$%han@samsung.com> In-reply-to: <003801cece02$6abb0160$40310420$%han@samsung.com> Subject: [PATCH 01/15] net: tulip: remove unnecessary pci_set_drvdata() Date: Mon, 21 Oct 2013 11:09:26 +0900 Message-id: <003901cece02$91b4ba40$b51e2ec0$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac7OAmqj3HcXTg4NSDu6YiXOSLcG+QAABINg Content-language: ko x-cr-hashedpuzzle: Ejvu GpV9 IVsA J8Js KaWW NrtE PNOw P69S RrNA TPhV TVN2 VL5b Xos5 Ze33 aiIG h4XA; 3; ZABhAHYAZQBtAEAAZABhAHYAZQBtAGwAbwBmAHQALgBuAGUAdAA7AGoAZwAxAC4AaABhAG4AQABzAGEAbQBzAHUAbgBnAC4AYwBvAG0AOwBuAGUAdABkAGUAdgBAAHYAZwBlAHIALgBrAGUAcgBuAGUAbAAuAG8AcgBnAA==; Sosha1_v1; 7; {6BB95C05-DE45-449A-B4A5-17124D11706D}; agBnADEALgBoAGEAbgBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA=; Mon, 21 Oct 2013 02:09:21 GMT; WwBQAEEAVABDAEgAIAAwADEALwAxADUAXQAgAG4AZQB0ADoAIAB0AHUAbABpAHAAOgAgAHIAZQBtAG8AdgBlACAAdQBuAG4AZQBjAGUAcwBzAGEAcgB5ACAAcABjAGkAXwBzAGUAdABfAGQAcgB2AGQAYQB0AGEAKAApAA== x-cr-puzzleid: {6BB95C05-DE45-449A-B4A5-17124D11706D} X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOIsWRmVeSWpSXmKPExsVy+t8zfd3rPSlBBm/f81nMOd/CYnF54SVW i2MLxByYPbasvMnk0bdlFaPH501yAcxRXDYpqTmZZalF+nYJXBlvj11nLpiqVLFkWTt7A+NS 2S5GTg4JAROJ3Yc7WCFsMYkL99azdTFycQgJLGOUuPiyhQmmqGlrJyNEYjqjROf7RmaQhJDA L0aJqTvSQGw2ATWJL18Os3cxcnCICOhKzL9uAhJmFrCTeDv1DBNEua3EwXv/wUo4geJzX2WA hIUF3CWOXjvFDmKzCKhKtMyfzgJi8wKVb9vcwAxhC0r8mHyPBWKklsT6nceZIGx5ic1r3jKD jJQQUJd49FcX4gAjiX97pCAqRCT2vXgHdryEwBEWid+LrkO9ayrxctl/qA+vsUt0dHJBnCAg 8W3yIRaIkbISmw4wQ5RIShxccYNlAqPULCQHzUJy0CwkB81CsnoBI8sqRtHUguSC4qT0IlO9 4sTc4tK8dL3k/NxNjJBInbiD8f4B60OMyUDrJzJLiSbnAyM9ryTe0NjMyMLUxNTYyNzSjDRh JXHe9EdJQUIC6YklqdmpqQWpRfFFpTmpxYcYmTg4pRoYqx4+rP8WJMG1/vrs2uR5+82e5U+z kDNu0582q0CA53C/SFCow/xdO7TKXn1iqJy50Ge19pPNuRXLWjhXx/NvjVPhM9+aOSXpHNOL soK5SdYS6iqeNS1bq71FLohMrfTTflJxraXsWT1jYVD/38RuvwphzvklRkv3LI5/qMd2o2Wn ONNP5mAlluKMREMt5qLiRAAim1sB6gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKKsWRmVeSWpSXmKPExsVy+t9jQd3rPSlBBj3vuSzmnG9hsbi88BKr xbEFYg7MHltW3mTy6NuyitHj8ya5AOaoBkabjNTElNQihdS85PyUzLx0WyXv4HjneFMzA0Nd Q0sLcyWFvMTcVFslF58AXbfMHKBFSgpliTmlQKGAxOJiJX07TBNCQ9x0LWAaI3R9Q4LgeowM 0EDCOsaMt8euMxdMVapYsqydvYFxqWwXIyeHhICJRNPWTkYIW0ziwr31bF2MXBxCAtMZJTrf NzKDJIQEfjFKTN2RBmKzCahJfPlymL2LkYNDREBXYv51E5Aws4CdxNupZ5ggym0lDt77D1bC CRSf+yoDJCws4C5x9NopdhCbRUBVomX+dBYQmxeofNvmBmYIW1Dix+R7LBAjtSTW7zzOBGHL S2xe85YZZKSEgLrEo7+6EAcYSfzbIwVRISKx78U7RpDjJQSOsEj8XnSdFeIrU4mXy/4zTWAU mYVkwywkG2Yh2TALyawFjCyrGEVTC5ILipPSc430ihNzi0vz0vWS83M3MYITwTPpHYyrGiwO MQpwMCrx8Aa4pAQJsSaWFVfmHmKU4GBWEuFN9QAK8aYkVlalFuXHF5XmpBYfYkwGBsBEZinR 5HxgksoriTc0NjEzsjQyszAyMTcnTVhJnPdgq3WgkEB6YklqdmpqQWoRzBYmDk6pBkaH2+8n vzDOMD/597DJ+ysG0/Ruc/j27PlQ/3pnf8qi2KV3l/hsWH5zqi1H7qXYg+fZldK+Wy33Mtm5 xjxI4iH/M/31JlY2O/SW+glNnacywSpj8c1JDy1WHNnXWXjds4B9rWmM1dX3h08qTjzKWuLw d/Lpe4ZdB13vbQi5yLHD68LCWU+ecxpIK7EUZyQaajEXFScCAG/snZZIAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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/dec/tulip/de2104x.c | 1 - drivers/net/ethernet/dec/tulip/dmfe.c | 3 --- drivers/net/ethernet/dec/tulip/tulip_core.c | 1 - drivers/net/ethernet/dec/tulip/uli526x.c | 2 -- drivers/net/ethernet/dec/tulip/winbond-840.c | 3 --- drivers/net/ethernet/dec/tulip/xircom_cb.c | 2 -- 6 files changed, 12 deletions(-) diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c index eaab73c..38148b0 100644 --- a/drivers/net/ethernet/dec/tulip/de2104x.c +++ b/drivers/net/ethernet/dec/tulip/de2104x.c @@ -2110,7 +2110,6 @@ static void de_remove_one(struct pci_dev *pdev) iounmap(de->regs); pci_release_regions(pdev); pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); free_netdev(dev); } diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c index 8313930..5ad9e3e 100644 --- a/drivers/net/ethernet/dec/tulip/dmfe.c +++ b/drivers/net/ethernet/dec/tulip/dmfe.c @@ -523,7 +523,6 @@ err_out_res: err_out_disable: pci_disable_device(pdev); err_out_free: - pci_set_drvdata(pdev, NULL); free_netdev(dev); return err; @@ -548,8 +547,6 @@ static void dmfe_remove_one(struct pci_dev *pdev) db->buf_pool_ptr, db->buf_pool_dma_ptr); pci_release_regions(pdev); free_netdev(dev); /* free board information */ - - pci_set_drvdata(pdev, NULL); } DMFE_DBUG(0, "dmfe_remove_one() exit", 0); diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index 4e8cfa2..add05f1 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c @@ -1939,7 +1939,6 @@ static void tulip_remove_one(struct pci_dev *pdev) pci_iounmap(pdev, tp->base_addr); free_netdev (dev); pci_release_regions (pdev); - pci_set_drvdata (pdev, NULL); /* pci_power_off (pdev, -1); */ } diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c index 93845af..a5397b1 100644 --- a/drivers/net/ethernet/dec/tulip/uli526x.c +++ b/drivers/net/ethernet/dec/tulip/uli526x.c @@ -429,7 +429,6 @@ err_out_release: err_out_disable: pci_disable_device(pdev); err_out_free: - pci_set_drvdata(pdev, NULL); free_netdev(dev); return err; @@ -450,7 +449,6 @@ static void uli526x_remove_one(struct pci_dev *pdev) db->buf_pool_ptr, db->buf_pool_dma_ptr); pci_release_regions(pdev); pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); free_netdev(dev); } diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c index c7b04ec..62fe512 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c @@ -468,7 +468,6 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; err_out_cleardev: - pci_set_drvdata(pdev, NULL); pci_iounmap(pdev, ioaddr); err_out_free_res: pci_release_regions(pdev); @@ -1542,8 +1541,6 @@ static void w840_remove1(struct pci_dev *pdev) pci_iounmap(pdev, np->base_addr); free_netdev(dev); } - - pci_set_drvdata(pdev, NULL); } #ifdef CONFIG_PM diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c index 9b84cb0..ab7ebac 100644 --- a/drivers/net/ethernet/dec/tulip/xircom_cb.c +++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c @@ -289,7 +289,6 @@ out: err_unmap: pci_iounmap(pdev, private->ioaddr); reg_fail: - pci_set_drvdata(pdev, NULL); dma_free_coherent(d, 8192, private->tx_buffer, private->tx_dma_handle); tx_buf_fail: dma_free_coherent(d, 8192, private->rx_buffer, private->rx_dma_handle); @@ -317,7 +316,6 @@ static void xircom_remove(struct pci_dev *pdev) unregister_netdev(dev); pci_iounmap(pdev, card->ioaddr); - pci_set_drvdata(pdev, NULL); dma_free_coherent(d, 8192, card->tx_buffer, card->tx_dma_handle); dma_free_coherent(d, 8192, card->rx_buffer, card->rx_dma_handle); free_netdev(dev);