From patchwork Thu May 23 10:30:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 245874 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 2E91A2C0174 for ; Thu, 23 May 2013 20:31:24 +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 1UfSnP-0001C0-Il; Thu, 23 May 2013 10:30:55 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfSnH-0007zL-II; Thu, 23 May 2013 10:30:47 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfSn6-0007wG-W8 for linux-mtd@lists.infradead.org; Thu, 23 May 2013 10:30:40 +0000 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MN800MZ5YI8REL0@mailout1.samsung.com> for linux-mtd@lists.infradead.org; Thu, 23 May 2013 19:30:11 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.47]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 77.F6.29708.3BFED915; Thu, 23 May 2013 19:30:11 +0900 (KST) X-AuditID: cbfee690-b7f6f6d00000740c-ec-519defb3abe1 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id C3.A4.28381.3BFED915; Thu, 23 May 2013 19:30:11 +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 <0MN800BG5YIBS560@mmp2.samsung.com>; Thu, 23 May 2013 19:30:11 +0900 (KST) From: Jingoo Han To: 'Artem Bityutskiy' Subject: [PATCH] mtd: maps: use platform_{get,set}_drvdata() Date: Thu, 23 May 2013 19:30:11 +0900 Message-id: <002a01ce57a0$8135e5a0$83a1b0e0$@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac5XoFoR3S5JstO5Qg2C/EGRstyxgw== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrGIsWRmVeSWpSXmKPExsVy+t8zfd3N7+cGGhzpU7W41f2a0WLiysnM FpcXXmK12N20jN2BxWPnrLvsHptXaHlsXlLv0bdlFWMASxSXTUpqTmZZapG+XQJXxpLHU9kL /vNVLNn1lbWB8QhPFyMnh4SAicTR3e0sELaYxIV769m6GLk4hASWMUo8n36VHabo2OldzBCJ 6YwS0z83s0I4vxglZj07xgpSxSagJvHly2GwDhEBHYneS5uYQGxmgTyJjj1/weLCAjYS7XtX soHYLAKqEntaWphBbF4BS4kPT7ayQtiCEj8m32OB6NWSWL/zONQceYnNa94yQ1ykILHj7GtG iF16EpsXtbJC1IhI7HvxjhHkOAmBTewSOw/cZodYJiDxbfIhoKEcQAlZiU0HoOZIShxccYNl AqPYLCSrZyFZPQvJ6llIVixgZFnFKJpakFxQnJReZKJXnJhbXJqXrpecn7uJERJnE3Yw3jtg fYgxGWj9RGYp0eR8YJzmlcQbGpsZWZiamBobmVuakSasJM6r3mIdKCSQnliSmp2aWpBaFF9U mpNafIiRiYNTqoHR/EHt2x+Hl7607Lt5pnyy57RHq2bf3X1ou3hgv6F+kvrWwNYNdv6Mh/5c OSZo32D1cFldn3fYgy1PJzA3mf1Ojcw4mLTps+NTE/vMAzve8tZPPnhAr/Pc378P9N+utpo+ 90LG7pOX1nV2cAc/kLwufcLwo760hoXSep6Nf4o22IlKtm765ZOUq8RSnJFoqMVcVJwIAKYI 8ynJAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprMKsWRmVeSWpSXmKPExsVy+t9jQd3N7+cGGuydomhxq/s1o8XElZOZ LS4vvMRqsbtpGbsDi8fOWXfZPTav0PLYvKTeo2/LKsYAlqgGRpuM1MSU1CKF1Lzk/JTMvHRb Je/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoJVKCmWJOaVAoYDE4mIlfTtME0JD3HQt YBojdH1DguB6jAzQQMI6xowlj6eyF/znq1iy6ytrA+MRni5GTg4JAROJY6d3MUPYYhIX7q1n 62Lk4hASmM4oMf1zMyuE84tRYtazY6wgVWwCahJfvhxmB7FFBHQkei9tYgKxmQXyJDr2/AWL CwvYSLTvXckGYrMIqErsaWkB28ArYCnx4clWVghbUOLH5HssEL1aEut3HoeaIy+xec1bqIsU JHacfc0IsUtPYvOiVlaIGhGJfS/eMU5gFJiFZNQsJKNmIRk1C0nLAkaWVYyiqQXJBcVJ6bmG esWJucWleel6yfm5mxjBUfxMagfjygaLQ4wCHIxKPLwSt+cECrEmlhVX5h5ilOBgVhLh3dwz N1CINyWxsiq1KD++qDQntfgQYzLQpxOZpUST84EJJq8k3tDYxMzI0sjMwsjE3Jw0YSVx3gOt 1oFCAumJJanZqakFqUUwW5g4OKUaGFktZROrN8nYFNxekr8y7UOmZtSkqeHqUgcjC9VWXV7y gtF2rUZGX9bcFcyv5rhkqMW131OcK7z6cZtz+nLOtnl/mFJrj6R5nr7dq7Btidnc9VxHe7zm bVi6mFXee42QkVw3l2qh/bZrSYe44349WJt34QrnhJqkg+1LZmy9cp159bVVSS8MJimxFGck GmoxFxUnAgDLjd8YJgMAAA== 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_063037_313274_7F296957 X-CRM114-Status: UNSURE ( 9.54 ) X-CRM114-Notice: Please train this message. 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.24 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 --- drivers/mtd/maps/physmap_of.c | 5 ++--- drivers/mtd/maps/sun_uflash.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c index d111097..d7deda9 100644 --- a/drivers/mtd/maps/physmap_of.c +++ b/drivers/mtd/maps/physmap_of.c @@ -43,10 +43,9 @@ static int of_flash_remove(struct platform_device *dev) struct of_flash *info; int i; - info = dev_get_drvdata(&dev->dev); + info = platform_get_drvdata(dev); if (!info) return 0; - dev_set_drvdata(&dev->dev, NULL); if (info->cmtd != info->list[0].mtd) { mtd_device_unregister(info->cmtd); @@ -204,7 +203,7 @@ static int of_flash_probe(struct platform_device *dev) if (!info) goto err_flash_remove; - dev_set_drvdata(&dev->dev, info); + platform_set_drvdata(dev, info); mtd_list = kzalloc(sizeof(*mtd_list) * count, GFP_KERNEL); if (!mtd_list) diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c index d467f3b..1cd4037 100644 --- a/drivers/mtd/maps/sun_uflash.c +++ b/drivers/mtd/maps/sun_uflash.c @@ -103,7 +103,7 @@ int uflash_devinit(struct platform_device *op, struct device_node *dp) mtd_device_register(up->mtd, NULL, 0); - dev_set_drvdata(&op->dev, up); + platform_set_drvdata(op, up); return 0; } @@ -123,7 +123,7 @@ static int uflash_probe(struct platform_device *op) static int uflash_remove(struct platform_device *op) { - struct uflash_dev *up = dev_get_drvdata(&op->dev); + struct uflash_dev *up = platform_get_drvdata(op); if (up->mtd) { mtd_device_unregister(up->mtd);