From patchwork Mon Sep 2 08:06:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 271707 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 F329F2C0079 for ; Mon, 2 Sep 2013 18:07:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754153Ab3IBIG5 (ORCPT ); Mon, 2 Sep 2013 04:06:57 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:44403 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752789Ab3IBIGz (ORCPT ); Mon, 2 Sep 2013 04:06:55 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MSH008ARNUXHTN0@mailout2.samsung.com> for netdev@vger.kernel.org; Mon, 02 Sep 2013 17:06:53 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.49]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 6D.EA.29948.D1744225; Mon, 02 Sep 2013 17:06:53 +0900 (KST) X-AuditID: cbfee691-b7f4a6d0000074fc-79-5224471dff80 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 0B.E5.05832.C1744225; Mon, 02 Sep 2013 17:06:52 +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 <0MSH00HEWNVGSU30@mmp2.samsung.com>; Mon, 02 Sep 2013 17:06:52 +0900 (KST) From: Jingoo Han To: "'David S. Miller'" Cc: netdev@vger.kernel.org, 'Petri Gynther' , 'Jingoo Han' Subject: [PATCH 1/5] net: emac: use platform_{get,set}_drvdata() Date: Mon, 02 Sep 2013 17:06:52 +0900 Message-id: <000f01cea7b3$6226fd30$2674f790$%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: Ac6ns2HeKGvP1VD6TzSApU7QqpfDWg== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsVy+t8zQ11Zd5Ugg2UNzBZzzrewWFxeeInV 4tgCMYvZ70UdWDy2rLzJ5LFgU6lH35ZVjB6fN8kFsERx2aSk5mSWpRbp2yVwZbxv+sBc8JC/ YuneFcwNjP28XYycHBICJhJPX61kg7DFJC7cWw9kc3EICSxjlOh+/JQdpmjDosVMEInpjBLP Fr2CqvrFKHHt/0UmkCo2ATWJL18OA3VwcIgI6ErMv24CEmYWSJe4cHkm2CBhAQeJxdsugNks AqoSs9Z2MYLYvAK2Euu2rmOBsAUlfky+xwLRqyWxfudxJghbXmLzmrfMIOMlBNQlHv3Vhdik J7FmjRJEhYjEvhfvGEEukxBYxy6xpOMnI8QqAYlvkw+xQLTKSmw6wAzxlqTEwRU3WCYwis1C sngWksWzkCyehWTFAkaWVYyiqQXJBcVJ6UWmesWJucWleel6yfm5mxgh0TVxB+P9A9aHGJOB 1k9klhJNzgdGZ15JvKGxmZGFqYmpsZG5pRlpwkrivOot1oFCAumJJanZqakFqUXxRaU5qcWH GJk4OKUaGPXl/jy+082ZqzlxzwmGLJdzagdCJfPtDjHIzdupq5Z2/cS1Dz/v63bKMTu7hHeJ 85cxnPwqcMFKjvlWU3NUY1R45Cs5o1f97rXlO6KmquqfbOOOnvtFbsZjU9Vjn1y94s+/YL52 oSVwtW/gzy9TZMuLLWfPUTqwR3eVq3jSOoNjD+RmXfNYpMRSnJFoqMVcVJwIAL2hfv7EAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjleLIzCtJLcpLzFFi42I5/e+xoK6Mu0qQwYdn1hZzzrewWFxeeInV 4tgCMYvZ70UdWDy2rLzJ5LFgU6lH35ZVjB6fN8kFsEQ1MNpkpCampBYppOYl56dk5qXbKnkH xzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXmAC1UUihLzCkFCgUkFhcr6dthmhAa4qZrAdMY oesbEgTXY2SABhLWMWa8b/rAXPCQv2Lp3hXMDYz9vF2MnBwSAiYSGxYtZoKwxSQu3FvP1sXI xSEkMJ1R4tmiV1DOL0aJa/8vglWxCahJfPlymL2LkYNDREBXYv51E5Aws0C6xIXLM9lBbGEB B4nF2y6A2SwCqhKz1nYxgti8ArYS67auY4GwBSV+TL7HAtGrJbF+53EmCFteYvOat8wg4yUE 1CUe/dWF2KQnsWaNEkSFiMS+F+8YJzAKzEIyaBaSQbOQDJqFpGUBI8sqRtHUguSC4qT0XCO9 4sTc4tK8dL3k/NxNjODYfSa9g3FVg8UhRgEORiUeXoVlykFCrIllxZW5hxglOJiVRHgfMasE CfGmJFZWpRblxxeV5qQWH2JMBvpzIrOUaHI+MK3klcQbGpuYGVkamVkYmZibkyasJM57sNU6 UEggPbEkNTs1tSC1CGYLEwenVAOjygpfz8YNn6pjHH+9XcnL0m5dqKv24qTbqsWi1jP3qvrM U//U7BK2ufdYgMmjjTWfNi13FOBLmWk9qVvm4L9fwhEzlnQt+t6yakaE4bPcko+z2uYt+793 6q19l2NFTweL3n+1J/iAUZW8joTks93Rf16dusyqFPHdSyrYIP5+UPhpvmOpNjK3lFiKMxIN tZiLihMBaV3tnSEDAAA= 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 Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device. This is a purely cosmetic change. Signed-off-by: Jingoo Han --- drivers/net/ethernet/ibm/emac/core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index 2d3b064..6b5c722 100644 --- a/drivers/net/ethernet/ibm/emac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c @@ -2312,7 +2312,7 @@ static int emac_check_deps(struct emac_instance *dev, if (deps[i].ofdev == NULL) continue; if (deps[i].drvdata == NULL) - deps[i].drvdata = dev_get_drvdata(&deps[i].ofdev->dev); + deps[i].drvdata = platform_get_drvdata(deps[i].ofdev); if (deps[i].drvdata != NULL) there++; } @@ -2799,9 +2799,9 @@ static int emac_probe(struct platform_device *ofdev) /* display more info about what's missing ? */ goto err_reg_unmap; } - dev->mal = dev_get_drvdata(&dev->mal_dev->dev); + dev->mal = platform_get_drvdata(dev->mal_dev); if (dev->mdio_dev != NULL) - dev->mdio_instance = dev_get_drvdata(&dev->mdio_dev->dev); + dev->mdio_instance = platform_get_drvdata(dev->mdio_dev); /* Register with MAL */ dev->commac.ops = &emac_commac_ops; @@ -2892,7 +2892,7 @@ static int emac_probe(struct platform_device *ofdev) * fully initialized */ wmb(); - dev_set_drvdata(&ofdev->dev, dev); + platform_set_drvdata(ofdev, dev); /* There's a new kid in town ! Let's tell everybody */ wake_up_all(&emac_probe_wait); @@ -2951,7 +2951,7 @@ static int emac_probe(struct platform_device *ofdev) static int emac_remove(struct platform_device *ofdev) { - struct emac_instance *dev = dev_get_drvdata(&ofdev->dev); + struct emac_instance *dev = platform_get_drvdata(ofdev); DBG(dev, "remove" NL);