From patchwork Mon Jun 10 00:00:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Goode X-Patchwork-Id: 250160 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 9A0502C02E9 for ; Mon, 10 Jun 2013 09:59: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 1UlpVv-000199-BD; Sun, 09 Jun 2013 23:59:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UlpVt-00068d-61; Sun, 09 Jun 2013 23:59:09 +0000 Received: from mail-lb0-f173.google.com ([209.85.217.173]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UlpVq-00067v-C5 for linux-mtd@lists.infradead.org; Sun, 09 Jun 2013 23:59:07 +0000 Received: by mail-lb0-f173.google.com with SMTP id v1so924970lbd.32 for ; Sun, 09 Jun 2013 16:58:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=k+8pqamLYLd1vh3Dpnc+YL0PEzvTuMm2IRQ4NZVnPYo=; b=S7RFus9RnDwbliW1gz6/ZyhZmwlulFumNn+XDn8EVwC+s1pGXWpy8OjnhiskfF0+p3 JqsH/ps6POFEf6JynqlGYI1cEIP+K+KPjFB3EcFhpqXt+7/u6XSmUjtipU7L+FqvCU4x iZj02ufxcnCRJRBZ/ptRvRuECp1S8arSkKOJyoqEmS/6q6BjMBU81E3LTaRwfXmJQiKI eQdtcTNWoIghQuFxlJoF4sYfjETU0iWXNi2kWIVV/O0HvCwI6b9kd2DS3DHdxUyUOX/x 1VnGPfoZmhWNIlep9aNEpxIYFDn2N5ia+4eR0FOQmcT919Z3mnb0lPzAL02crEcPW6dD DvzA== X-Received: by 10.152.121.73 with SMTP id li9mr3823752lab.42.1370822323958; Sun, 09 Jun 2013 16:58:43 -0700 (PDT) Received: from localhost.localdomain (c193-14-104-184.cust.tele2.se. [193.14.104.184]) by mx.google.com with ESMTPSA id 3sm2221136lbr.0.2013.06.09.16.58.42 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 09 Jun 2013 16:58:43 -0700 (PDT) From: Emil Goode To: dwmw2@infradead.org, artem.bityutskiy@linux.intel.com, andrew@lunn.ch, wfp5p@virginia.edu, jg1.han@samsung.com Subject: [PATCH v2] mtd: orion_nand: Improve error handling in orion_nand_probe Date: Mon, 10 Jun 2013 02:00:42 +0200 Message-Id: <1370822442-25217-1-git-send-email-emilgoode@gmail.com> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130609_195906_639375_11DBEE60 X-CRM114-Status: GOOD ( 16.38 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.173 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (emilgoode[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: kernel-janitors@vger.kernel.org, Emil Goode , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.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: , MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch fixes some issues in the error handling and simplifies the code by converting to devm* functions. If the kzalloc call fails it is unnecessary to use the label no_res and pass a NULL pointer to kfree. If the devm_kzalloc call fails on line 110 we forget to call iounmap for the previous ioremap call. The following changes are introduced: - Convert to devm_kzalloc and remove calls to kfree. - Convert to devm_ioremap_resource that adds a missing call to *request_mem_region and remove calls to iounmap. - The devm_ioremap_resource function checks the passed resource so we can remove the NULL check after the platform_get_resource call. Signed-off-by: Emil Goode --- This patch is only build tested v2: Fix change log typo and remove error messages for kzalloc calls drivers/mtd/nand/orion_nand.c | 49 +++++++++++++---------------------------- 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c index 8fbd002..76b9fba 100644 --- a/drivers/mtd/nand/orion_nand.c +++ b/drivers/mtd/nand/orion_nand.c @@ -85,35 +85,24 @@ static int __init orion_nand_probe(struct platform_device *pdev) int ret = 0; u32 val = 0; - nc = kzalloc(sizeof(struct nand_chip) + sizeof(struct mtd_info), GFP_KERNEL); - if (!nc) { - printk(KERN_ERR "orion_nand: failed to allocate device structure.\n"); - ret = -ENOMEM; - goto no_res; - } + nc = devm_kzalloc(&pdev->dev, sizeof(struct nand_chip) + + sizeof(struct mtd_info), GFP_KERNEL); + if (!nc) + return -ENOMEM; + mtd = (struct mtd_info *)(nc + 1); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - ret = -ENODEV; - goto no_res; - } - - io_base = ioremap(res->start, resource_size(res)); - if (!io_base) { - printk(KERN_ERR "orion_nand: ioremap failed\n"); - ret = -EIO; - goto no_res; - } + io_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(io_base)) + return PTR_ERR(io_base); if (pdev->dev.of_node) { board = devm_kzalloc(&pdev->dev, sizeof(struct orion_nand_data), - GFP_KERNEL); - if (!board) { - printk(KERN_ERR "orion_nand: failed to allocate board structure.\n"); - ret = -ENOMEM; - goto no_res; - } + GFP_KERNEL); + if (!board) + return -ENOMEM; + if (!of_property_read_u32(pdev->dev.of_node, "cle", &val)) board->cle = (u8)val; else @@ -167,7 +156,7 @@ static int __init orion_nand_probe(struct platform_device *pdev) if (nand_scan(mtd, 1)) { ret = -ENXIO; - goto no_dev; + goto disable_clk; } mtd->name = "orion_nand"; @@ -176,20 +165,17 @@ static int __init orion_nand_probe(struct platform_device *pdev) board->parts, board->nr_parts); if (ret) { nand_release(mtd); - goto no_dev; + goto disable_clk; } return 0; -no_dev: +disable_clk: if (!IS_ERR(clk)) { clk_disable_unprepare(clk); clk_put(clk); } platform_set_drvdata(pdev, NULL); - iounmap(io_base); -no_res: - kfree(nc); return ret; } @@ -197,15 +183,10 @@ no_res: static int orion_nand_remove(struct platform_device *pdev) { struct mtd_info *mtd = platform_get_drvdata(pdev); - struct nand_chip *nc = mtd->priv; struct clk *clk; nand_release(mtd); - iounmap(nc->IO_ADDR_W); - - kfree(nc); - clk = clk_get(&pdev->dev, NULL); if (!IS_ERR(clk)) { clk_disable_unprepare(clk);