From patchwork Wed Feb 12 02:34:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 319478 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5DFBB2C009B for ; Wed, 12 Feb 2014 13:35:15 +1100 (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 1WDPfH-0000LM-6p; Wed, 12 Feb 2014 02:35:07 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDPfF-00035J-Az; Wed, 12 Feb 2014 02:35:05 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDPfC-00033Y-4f for linux-mtd@lists.infradead.org; Wed, 12 Feb 2014 02:35:03 +0000 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 <0N0V009T535QNP80@mailout2.samsung.com> for linux-mtd@lists.infradead.org; Wed, 12 Feb 2014 11:34:38 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.50]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 6F.B0.14803.EBDDAF25; Wed, 12 Feb 2014 11:34:38 +0900 (KST) X-AuditID: cbfee691-b7efc6d0000039d3-29-52faddbedb23 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 7A.8C.29263.EBDDAF25; Wed, 12 Feb 2014 11:34:38 +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 <0N0V00MES35QOD90@mmp2.samsung.com>; Wed, 12 Feb 2014 11:34:38 +0900 (KST) From: Jingoo Han To: 'Brian Norris' References: <000201cf279a$49891080$dc9b3180$%han@samsung.com> In-reply-to: <000201cf279a$49891080$dc9b3180$%han@samsung.com> Subject: [PATCH 2/2] mtd: omap2: Use devm_ioremap_resource() Date: Wed, 12 Feb 2014 11:34:37 +0900 Message-id: <000301cf279a$f9722d10$ec568730$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac8nmkO0VQNMDyiSQjuDsyqBksq3gwAAHjag Content-language: ko x-cr-hashedpuzzle: FTxO JZs/ LCRu OP9G PgFz T8JY Wudv bSLD dd1G hra6 mtVk qk0Y 5/eL 9b+N +Y+O +w66; 6; YwBvAG0AcAB1AHQAZQByAHMAZgBvAHIAcABlAGEAYwBlAEAAZwBtAGEAaQBsAC4AYwBvAG0AOwBkAHcAbQB3ADIAQABpAG4AZgByAGEAZABlAGEAZAAuAG8AcgBnADsAZQB6AGUAcQB1AGkAZQBsAC4AZwBhAHIAYwBpAGEAQABmAHIAZQBlAC0AZQBsAGUAYwB0AHIAbwBuAHMALgBjAG8AbQA7AGoAZwAxAC4AaABhAG4AQABzAGEAbQBzAHUAbgBnAC4AYwBvAG0AOwBsAGkAbgB1AHgALQBtAHQAZABAAGwAaQBzAHQAcwAuAGkAbgBmAHIAYQBkAGUAYQBkAC4AbwByAGcAOwBwAGUAawBvAG4AQAB0AGkALgBjAG8AbQA=; Sosha1_v1; 7; {8B88E7F6-C385-4532-ADFE-A9E8E93092F5}; agBnADEALgBoAGEAbgBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA=; Wed, 12 Feb 2014 02:34:28 GMT; WwBQAEEAVABDAEgAIAAyAC8AMgBdACAAbQB0AGQAOgAgAG8AbQBhAHAAMgA6ACAAVQBzAGUAIABkAGUAdgBtAF8AaQBvAHIAZQBtAGEAcABfAHIAZQBzAG8AdQByAGMAZQAoACkA x-cr-puzzleid: {8B88E7F6-C385-4532-ADFE-A9E8E93092F5} X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOIsWRmVeSWpSXmKPExsVy+t8zI919d38FGXxdLWhx5MJaZouJKycz W5w+tYDV4vLCS6wWu5uWsVvMbtjF5sDm8WTTRUaPnbPusntsXqHlsXlJvUffllWMHsdvbGcK YIvisklJzcksSy3St0vgyjiwaAZ7QStfxYnly1kbGE9ydzFyckgImEjcW7eLFcIWk7hwbz1b FyMXh5DAMkaJPZN+MsMUTe/5xA5iCwlMZ5T426UOUfSLUWLyxk1MIAk2ATWJL18OAxVxcIgI GEj8eJMJEmYWOM0o0XmdC6LXVuLo/d0sIDangJ3EjCfXwVqFBWwkzj9uZwZpZRFQlXjcowcS 5gUq33J+IyuELSjxY/I9FoiRWhLrdx5ngrDlJTaveQvWKiGgLvHory5IWETASOLNnNnsECUi EvtevGMEuVhCoIFN4sqcLWwQb5lKPH19lRUi0cohMW/PB7B/WQQEJL5NPsQCMVRWYtMBaDBI ShxccYNlAqPULCQnzUJy0iwkJ81CsnsBI8sqRtHUguSC4qT0IlO94sTc4tK8dL3k/NxNjJBI n7iD8f4B60OMyUDrJzJLiSbnAxNFXkm8obGZkYWpiamxkbmlGWnCSuK86Y+SgoQE0hNLUrNT UwtSi+KLSnNSiw8xMnFwSjUwijZ887F7rnVYNU1+A/v8vvXdVe+7P8qz3X2tluVY7BeRVLRq ffUhTZ97X27NeWbVLtj5bcF1/4dLrnZd7+y+fXLrZZdu1niDTKEpq4T2v/5VdLt6Bw/vNVb9 I2cdvF80NSoZTTo1W8nH58zZuZOnzyluXic9c63gLaloNSMO3yWuZT6mkxKNlViKMxINtZiL ihMBwO4K/QoDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCKsWRmVeSWpSXmKPExsVy+t9jQd19d38FGTRM5bU4cmEts8XElZOZ LU6fWsBqcXnhJVaL3U3L2C1mN+xic2DzeLLpIqPHzll32T02r9Dy2Lyk3qNvyypGj+M3tjMF sEU1MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXmAJ2h pFCWmFMKFApILC5W0rfDNCE0xE3XAqYxQtc3JAiux8gADSSsY8w4sGgGe0ErX8WJ5ctZGxhP cncxcnJICJhITO/5xA5hi0lcuLeeDcQWEpjOKPG3S72LkQvI/sUoMXnjJiaQBJuAmsSXL4eB Gjg4RAQMJH68yQQJMwucZpTovM4F0WsrcfT+bhYQm1PATmLGk+tgrcICNhLnH7czg7SyCKhK PO7RAwnzApVvOb+RFcIWlPgx+R4LxEgtifU7jzNB2PISm9e8BWuVEFCXePRXFyQsImAk8WbO bHaIEhGJfS/eMYJcLCHQwCZxZc4WNoi3TCWevr7KOoFRZBaSFbOQrJiFZMUsJLMWMLKsYhRN LUguKE5KzzXUK07MLS7NS9dLzs/dxAhOI8+kdjCubLA4xCjAwajEw8vg+StIiDWxrLgy9xCj BAezkgiv/gmgEG9KYmVValF+fFFpTmrxIcZkYABMZJYSTc4Hpri8knhDYxMzI0sjMwsjE3Nz 0oSVxHkPtFoHCgmkJ5akZqemFqQWwWxh4uCUamDMOhpcdp9L/9ei6k8bquYJfL3T0pzlcL/a o+nhRaH+Fb/uSU5Zo3ampuyBci7n+hfZt5fFnXv0V9mr/Ow6q7cCjewujMFP9B9OWTiHf0rR g3wbFq2rE7crNtnL2e8uYfo9d9t7qxsGy7p8Ao8dtzo1rXtfZ1QvZ2B+pOke67v3N12WKxco DvyrxFKckWioxVxUnAgAtBBrCmcDAAA= 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-20140211_213502_438158_FBE34E77 X-CRM114-Status: UNSURE ( 9.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.5 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.5 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 -0.6 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] Cc: linux-mtd@lists.infradead.org, 'Jingoo Han' , 'David Woodhouse' , "'Gupta, Pekon'" , 'Ezequiel Garcia' 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 devm_ioremap_resource() in order to make the code simpler, and remove redundant return value check of platform_get_resource() because the value is checked by devm_ioremap_resource(). Also, 'unsigned long mem_size' is removed from 'struct omap_nand_info', because the 'mem_size' variable is not necessary anymore. Signed-off-by: Jingoo Han --- drivers/mtd/nand/omap2.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index ef4190a..2c44586 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -159,7 +159,6 @@ struct omap_nand_info { int gpmc_cs; unsigned long phys_base; - unsigned long mem_size; struct completion comp; struct dma_chan *dma; int gpmc_irq_fifo; @@ -1665,27 +1664,11 @@ static int omap_nand_probe(struct platform_device *pdev) nand_chip->options |= NAND_SKIP_BBTSCAN; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (res == NULL) { - err = -EINVAL; - dev_err(&pdev->dev, "error getting memory resource\n"); - goto return_error; - } + nand_chip->IO_ADDR_R = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(nand_chip->IO_ADDR_R)) + return PTR_ERR(nand_chip->IO_ADDR_R); info->phys_base = res->start; - info->mem_size = resource_size(res); - - if (!devm_request_mem_region(&pdev->dev, info->phys_base, - info->mem_size, pdev->dev.driver->name)) { - err = -EBUSY; - goto return_error; - } - - nand_chip->IO_ADDR_R = devm_ioremap(&pdev->dev, info->phys_base, - info->mem_size); - if (!nand_chip->IO_ADDR_R) { - err = -ENOMEM; - goto return_error; - } nand_chip->controller = &info->controller;