From patchwork Tue May 7 04:50:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 241952 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 80B952C011D for ; Tue, 7 May 2013 14:50:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758276Ab3EGEuX (ORCPT ); Tue, 7 May 2013 00:50:23 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:63675 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757226Ab3EGEuW (ORCPT ); Tue, 7 May 2013 00:50:22 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MME00FX8W3WF080@mailout2.samsung.com> for netdev@vger.kernel.org; Tue, 07 May 2013 13:50:21 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id F2.C7.31024.C0888815; Tue, 07 May 2013 13:50:20 +0900 (KST) X-AuditID: cbfee68d-b7f016d000007930-93-5188880c06b9 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 0A.33.08957.C0888815; Tue, 07 May 2013 13:50:20 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MME004TIW3WSIG0@mmp1.samsung.com>; Tue, 07 May 2013 13:50:20 +0900 (KST) From: Jingoo Han To: "'David S. Miller'" Cc: netdev@vger.kernel.org, Jingoo Han , Nicolas Pitre , 'Steve Glendinning' Subject: [PATCH 26/36] net: ethernet: smsc: remove unnecessary platform_set_drvdata() Date: Tue, 07 May 2013 13:50:20 +0900 Message-id: <002b01ce4ade$60b71750$222545f0$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac5K3i2LsWPtMfOmRE6IpnEvDYE4Cg== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrAIsWRmVeSWpSXmKPExsVy+t8zY12ejo5Ag0+NFhZzzrewWFxeeInV 4tgCMYt5L16wWTR/esXkwOqxZeVNJo9nJ9rZPPq2rGL0+N98mcXj8ya5ANYoLpuU1JzMstQi fbsErozzrxsYC5pFK1asmsLUwPhTsIuRk0NCwERi7fwGZghbTOLCvfVsXYxcHEICyxgldi79 xwZTtKRpKztEYhGjxNSGt1DOL0aJlvYZjCBVbAJqEl++HAZKcHCICOhKzL9uAlLDLDCdUeLB aZBuTg5hgXCJ2QdugNksAqoSi961sILYvAKWEv8uNkDZghI/Jt9jAbGZBbQk1u88zgRhy0ts XvMW6lQFiR1nX4PtFRHQk9i2cj1UjYjEvhfvGEEWSwgcYpc41LaTBWKZgMS3yYdYQI6TEJCV 2HQAao6kxMEVN1gmMIrNQrJ6FpLVs5CsnoVkxQJGllWMoqkFyQXFSelFhnrFibnFpXnpesn5 uZsYIbHXu4Px9gHrQ4zJQOsnMkuJJucDYzevJN7Q2MzIwtTE1NjI3NKMNGElcV61FutAIYH0 xJLU7NTUgtSi+KLSnNTiQ4xMHJxSDYxFQoaBphVyh/eqnzRe/V/PdFnPvF88yToPnHbsbjNZ 8Lj7x0/v938dXBJF5yWo5oj9flvk7+z94YyJ4aTZzQbHA6598GHpM5+0Wiwup/m3kaZM6Tpl q8XKL+wU+peeeZCSZRmn2PP2WZ/FZj7Pwjf+//++/HTz6IfS9bOe92ttMDbemFy7KFuJpTgj 0VCLuag4EQCNao/B0wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLKsWRmVeSWpSXmKPExsVy+t9jAV2ejo5Ag7YzhhZzzrewWFxeeInV 4tgCMYt5L16wWTR/esXkwOqxZeVNJo9nJ9rZPPq2rGL0+N98mcXj8ya5ANaoBkabjNTElNQi hdS85PyUzLx0WyXv4HjneFMzA0NdQ0sLcyWFvMTcVFslF58AXbfMHKDlSgpliTmlQKGAxOJi JX07TBNCQ9x0LWAaI3R9Q4LgeowM0EDCOsaM868bGAuaRStWrJrC1MD4U7CLkZNDQsBEYknT VnYIW0ziwr31bF2MXBxCAosYJaY2vGWHcH4xSrS0z2AEqWITUJP48uUwUIKDQ0RAV2L+dROQ GmaB6YwSD05DTBIWCJeYfeAGmM0ioCqx6F0LK4jNK2Ap8e9iA5QtKPFj8j0WEJtZQEti/c7j TBC2vMTmNW+ZIS5SkNhx9jXYXhEBPYltK9dD1YhI7HvxjnECo8AsJKNmIRk1C8moWUhaFjCy rGIUTS1ILihOSs811CtOzC0uzUvXS87P3cQIjuxnUjsYVzZYHGIU4GBU4uFVONUeKMSaWFZc mXuIUYKDWUmEV1q7I1CINyWxsiq1KD++qDQntfgQYzLQpxOZpUST84FJJ68k3tDYxMzI0sjM wsjE3Jw0YSVx3gOt1oFCAumJJanZqakFqUUwW5g4OKUaGHc9kpoSxH9O7dG/Q2eOzPo43zB6 FnN3gtB9geMF+RdWxtXoNF6/vbUwxPj9JkkNJ7bQv1bG9lfFSpfFuO/e9/RrwUHLi98vWouc r5h/5sG/eR6GZd/7w3TVji8o/tqzXy1PcUoIs9fvuq8VHd1z97LG1EVwqPusvu3Wuliwccai aWXn2x94fFNiKc5INNRiLipOBAA2KSbHMAMAAA== 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, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han --- drivers/net/ethernet/smsc/smc911x.c | 2 -- drivers/net/ethernet/smsc/smc91x.c | 3 --- drivers/net/ethernet/smsc/smsc911x.c | 2 -- 3 files changed, 0 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c index 9dd842d..345558f 100644 --- a/drivers/net/ethernet/smsc/smc911x.c +++ b/drivers/net/ethernet/smsc/smc911x.c @@ -2087,7 +2087,6 @@ static int smc911x_drv_probe(struct platform_device *pdev) ndev->base_addr = res->start; ret = smc911x_probe(ndev); if (ret != 0) { - platform_set_drvdata(pdev, NULL); iounmap(addr); release_both: free_netdev(ndev); @@ -2113,7 +2112,6 @@ static int smc911x_drv_remove(struct platform_device *pdev) struct resource *res; DBG(SMC_DEBUG_FUNC, "--> %s\n", __func__); - platform_set_drvdata(pdev, NULL); unregister_netdev(ndev); diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index dfbf978..cde13be 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -2299,7 +2299,6 @@ static int smc_drv_probe(struct platform_device *pdev) return 0; out_iounmap: - platform_set_drvdata(pdev, NULL); iounmap(addr); out_release_attrib: smc_release_attrib(pdev, ndev); @@ -2319,8 +2318,6 @@ static int smc_drv_remove(struct platform_device *pdev) struct smc_local *lp = netdev_priv(ndev); struct resource *res; - platform_set_drvdata(pdev, NULL); - unregister_netdev(ndev); free_irq(ndev->irq, ndev); diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 3663b9e..a141921 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -2284,7 +2284,6 @@ static int smsc911x_drv_remove(struct platform_device *pdev) mdiobus_unregister(pdata->mii_bus); mdiobus_free(pdata->mii_bus); - platform_set_drvdata(pdev, NULL); unregister_netdev(dev); free_irq(dev->irq, dev); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, @@ -2539,7 +2538,6 @@ out_disable_resources: out_enable_resources_fail: smsc911x_free_resources(pdev); out_request_resources_fail: - platform_set_drvdata(pdev, NULL); iounmap(pdata->ioaddr); free_netdev(dev); out_release_io_1: