From patchwork Thu May 23 10:31:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 245875 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AFECD2C0329 for ; Thu, 23 May 2013 20:32:42 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfSoP-0001Xh-1S; Thu, 23 May 2013 10:31:57 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfSo1-00080z-5G; Thu, 23 May 2013 10:31:33 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfSny-00080O-4S for linux-mtd@lists.infradead.org; Thu, 23 May 2013 10:31:32 +0000 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MN800DVKYJDAFY0@mailout2.samsung.com> for linux-mtd@lists.infradead.org; Thu, 23 May 2013 19:31:07 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id B9.37.03969.BEFED915; Thu, 23 May 2013 19:31:07 +0900 (KST) X-AuditID: cbfee68f-b7f436d000000f81-e5-519defebde98 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id DC.17.21068.BEFED915; Thu, 23 May 2013 19:31:07 +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 <0MN8001Z0YJV7I60@mmp1.samsung.com>; Thu, 23 May 2013 19:31:07 +0900 (KST) From: Jingoo Han To: 'Artem Bityutskiy' Subject: [PATCH] mtd: nand: use platform_{get,set}_drvdata() Date: Thu, 23 May 2013 19:31:07 +0900 Message-id: <002b01ce57a0$a29c4fe0$e7d4efa0$@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac5XoIx/sIcdjPhwQ2O4NTbr6EDvYg== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCIsWRmVeSWpSXmKPExsVy+t8zA93X7+cGGtyeomFxq/s1o8XElZOZ LS4vvMRqsbtpGbsDi8fOWXfZPTav0PLYvKTeo2/LKsYAligum5TUnMyy1CJ9uwSujEctj5gL FilUTDuzna2BcaZ0FyMnh4SAicS2mUtZIWwxiQv31rN1MXJxCAksY5T49HwzexcjB1jR4omR EPFFjBLHt+9khXB+MUrMOd/HBNLNJqAm8eXLYXYQW0RAR6L30iawOLNAnkTHnr9gcWEBG4mH x8+zgNgsAqoSq1ougm3mFbCU2DD/DjOELSjxY/I9FoheLYn1O49DzZGX2LzmLTPEpQoSO86+ ZoTYpSdx4NMWqHoRiX0v3jFC1Gxil5i/sAhil4DEt8mHWCCekZXYdABqjKTEwRU3WCYwis1C snkWks2zkGyehWTDAkaWVYyiqQXJBcVJ6UXGesWJucWleel6yfm5mxghMda/g/HuAetDjMlA 6ycyS4km5wNjNK8k3tDYzMjC1MTU2Mjc0ow0YSVxXrUW60AhgfTEktTs1NSC1KL4otKc1OJD jEwcnFINjJM/HhVbJLr2XmWv7O7p3WdmvmBwC3hnf+TsG5WHdSmehxwDVSerO4R0rOpJLYiZ lPKy1Fz05NVHp5MX9my6d/D8vHdvFyUdz468uKFMO0njqOvsf5wmezPEZnB2LWMR2GTAcrDJ 111Y9uzHKcWzDpyUSmq5cvu5Kpcwy4v9vV2xz6eaLDscsUyJpTgj0VCLuag4EQC8sJdfxwIA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEKsWRmVeSWpSXmKPExsVy+t9jAd3X7+cGGmxuUbG41f2a0WLiysnM FpcXXmK12N20jN2BxWPnrLvsHptXaHlsXlLv0bdlFWMAS1QDo01GamJKapFCal5yfkpmXrqt kndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0EolhbLEnFKgUEBicbGSvh2mCaEhbroW MI0Rur4hQXA9RgZoIGEdY8ajlkfMBYsUKqad2c7WwDhTuouRg0NCwERi8cTILkZOIFNM4sK9 9WxdjFwcQgKLGCWOb9/JCuH8YpSYc76PCaSKTUBN4suXw+wgtoiAjkTvpU1gcWaBPImOPX/B 4sICNhIPj59nAbFZBFQlVrVcZAWxeQUsJTbMv8MMYQtK/Jh8jwWiV0ti/c7jUHPkJTavecsM cZGCxI6zrxkhdulJHPi0BapeRGLfi3eMExgFZiEZNQvJqFlIRs1C0rKAkWUVo2hqQXJBcVJ6 rpFecWJucWleul5yfu4mRnAMP5PewbiqweIQowAHoxIPr8TtOYFCrIllxZW5hxglOJiVRHg3 98wNFOJNSaysSi3Kjy8qzUktPsSYDPTpRGYp0eR8YHrJK4k3NDYxM7I0MrMwMjE3J01YSZz3 YKt1oJBAemJJanZqakFqEcwWJg5OqQZGNv2OzsvafXk9+/b+fDt39lbet3/mLn76dtsakYcb 9bLzVPoNoivj7TJ4skobP0Yeckxe1v4g9BH3mZ8SM17Pufv5DtfZ3mevJN50c394uNV15lb9 n+HtCw/FzOp8HV3AusGCZcNkdpXmD5M9GqTWWf5/+kB0rUmc6tOMd2xc/5o6nqn6Xr9uq8RS nJFoqMVcVJwIAItw+jQlAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130523_063130_779115_070C6F5E X-CRM114-Status: GOOD ( 13.78 ) X-Spam-Score: -7.9 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.25 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.1 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 T_HDRS_LCASE Odd capitalization of message header 0.0 T_MANY_HDRS_LCASE Odd capitalization of multiple message headers Cc: 'David Woodhouse' , Jingoo Han , linux-mtd@lists.infradead.org X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.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. Signed-off-by: Jingoo Han Acked-by: Brian Norris --- drivers/mtd/nand/fsl_elbc_nand.c | 2 +- drivers/mtd/nand/fsl_ifc_nand.c | 2 +- drivers/mtd/nand/fsl_upm.c | 4 ++-- drivers/mtd/nand/ndfc.c | 4 ++-- drivers/mtd/nand/socrates_nand.c | 6 ++---- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c index 2065720..44d2073 100644 --- a/drivers/mtd/nand/fsl_elbc_nand.c +++ b/drivers/mtd/nand/fsl_elbc_nand.c @@ -915,7 +915,7 @@ err: static int fsl_elbc_nand_remove(struct platform_device *pdev) { struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = fsl_lbc_ctrl_dev->nand; - struct fsl_elbc_mtd *priv = dev_get_drvdata(&pdev->dev); + struct fsl_elbc_mtd *priv = platform_get_drvdata(pdev); fsl_elbc_chip_remove(priv); diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c index 317a771..f20986b 100644 --- a/drivers/mtd/nand/fsl_ifc_nand.c +++ b/drivers/mtd/nand/fsl_ifc_nand.c @@ -1050,7 +1050,7 @@ err: static int fsl_ifc_nand_remove(struct platform_device *dev) { - struct fsl_ifc_mtd *priv = dev_get_drvdata(&dev->dev); + struct fsl_ifc_mtd *priv = platform_get_drvdata(dev); fsl_ifc_chip_remove(priv); diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c index 04e0725..e5b7597 100644 --- a/drivers/mtd/nand/fsl_upm.c +++ b/drivers/mtd/nand/fsl_upm.c @@ -303,7 +303,7 @@ static int fun_probe(struct platform_device *ofdev) if (ret) goto err2; - dev_set_drvdata(&ofdev->dev, fun); + platform_set_drvdata(ofdev, fun); return 0; err2: @@ -320,7 +320,7 @@ err1: static int fun_remove(struct platform_device *ofdev) { - struct fsl_upm_nand *fun = dev_get_drvdata(&ofdev->dev); + struct fsl_upm_nand *fun = platform_get_drvdata(ofdev); int i; nand_release(&fun->mtd); diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c index 8e148f1..fa65c1b 100644 --- a/drivers/mtd/nand/ndfc.c +++ b/drivers/mtd/nand/ndfc.c @@ -223,7 +223,7 @@ static int ndfc_probe(struct platform_device *ofdev) spin_lock_init(&ndfc->ndfc_control.lock); init_waitqueue_head(&ndfc->ndfc_control.wq); ndfc->ofdev = ofdev; - dev_set_drvdata(&ofdev->dev, ndfc); + platform_set_drvdata(ofdev, ndfc); ndfc->ndfcbase = of_iomap(ofdev->dev.of_node, 0); if (!ndfc->ndfcbase) { @@ -258,7 +258,7 @@ static int ndfc_probe(struct platform_device *ofdev) static int ndfc_remove(struct platform_device *ofdev) { - struct ndfc_controller *ndfc = dev_get_drvdata(&ofdev->dev); + struct ndfc_controller *ndfc = platform_get_drvdata(ofdev); nand_release(&ndfc->mtd); kfree(ndfc->mtd.name); diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c index 09dde7d..5090c8c 100644 --- a/drivers/mtd/nand/socrates_nand.c +++ b/drivers/mtd/nand/socrates_nand.c @@ -190,7 +190,7 @@ static int socrates_nand_probe(struct platform_device *ofdev) /* TODO: I have no idea what real delay is. */ nand_chip->chip_delay = 20; /* 20us command delay time */ - dev_set_drvdata(&ofdev->dev, host); + platform_set_drvdata(ofdev, host); /* first scan to find the device and get the page size */ if (nand_scan_ident(mtd, 1, NULL)) { @@ -211,7 +211,6 @@ static int socrates_nand_probe(struct platform_device *ofdev) nand_release(mtd); out: - dev_set_drvdata(&ofdev->dev, NULL); iounmap(host->io_base); kfree(host); return res; @@ -222,12 +221,11 @@ out: */ static int socrates_nand_remove(struct platform_device *ofdev) { - struct socrates_nand_host *host = dev_get_drvdata(&ofdev->dev); + struct socrates_nand_host *host = platform_get_drvdata(ofdev); struct mtd_info *mtd = &host->mtd; nand_release(mtd); - dev_set_drvdata(&ofdev->dev, NULL); iounmap(host->io_base); kfree(host);