From patchwork Fri Sep 28 21:36:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11858 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 28EA323E42 for ; Fri, 28 Sep 2012 21:36:24 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 981D5A18585 for ; Fri, 28 Sep 2012 21:36:23 +0000 (UTC) Received: by ieje10 with SMTP id e10so8011610iej.11 for ; Fri, 28 Sep 2012 14:36:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=i0r/DMuek5eElO8V296E130yhZLwZBawy/AJpiT4Vbg=; b=jPs/RS8KotaeUxB6bR45QmJdwyaKZybCl995WhOIJx2rcUNOkN3Zo8fj0TonFe/R40 BN2x1xwm3/BVrzewt1LVKZkeWk7Kf2ZzmB4Gyt+iFUSBV2J1GZufuSgUCVugrRq0Mq02 /th2PD3PGxk6tliBZrTchBc2a7UnGwQ3NgUHNZ7b6rmshTY9DB3NPt68URtsWlRPwMH7 gPUk8yS40AwppnOuU4D8Z4yKTZ++sfM09DXco1Fhyc5tF7SZHlOKdixa1xDMBTrgH1gO MuO7IUXVOt7nJvRxE6OOyb0GyRj5QbCmcc2nxotqUd1CIfCXFuJOVh1Ofd9K2nVbRC7N Tz6w== Received: by 10.50.160.165 with SMTP id xl5mr70997igb.0.1348868182859; Fri, 28 Sep 2012 14:36:22 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp494980igc; Fri, 28 Sep 2012 14:36:22 -0700 (PDT) Received: by 10.204.11.194 with SMTP id u2mr4305622bku.41.1348868181384; Fri, 28 Sep 2012 14:36:21 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.186]) by mx.google.com with ESMTPS id im8si14165517bkc.133.2012.09.28.14.36.20 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 28 Sep 2012 14:36:21 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.186 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.186; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.186 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0Lwnl2-1TXKJP0GNc-016njv; Fri, 28 Sep 2012 23:36:19 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, arm@kernel.org, Arnd Bergmann , Jean-Christophe PLAGNIOL-VILLARD , Artem Bityutskiy Subject: [PATCH 01/12] mtd: atmel nand: build regression Date: Fri, 28 Sep 2012 23:36:06 +0200 Message-Id: <1348868177-21205-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1348868177-21205-1-git-send-email-arnd@arndb.de> References: <1348868177-21205-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:9Fbq1MsUJ6ygBmdvuMvCw5l1YBa5tixauLBXHjpezPS 7XjGAC0y9mmto3CZ2xKlakgzP7Yd/X8mcfvmBCXrmGIej4hzbT 3RM0Wxjjhs8Ia4YbrdAfhMHI9XwZ4p3Qd/mYUZ+rrk7T/XBkda Yb12wN8gA94mIuJLduualKvZPs54CoGgh9y7Xrs7wx03Q0eNFT N+uqNje4f2y8HkKW9S6bnBQtjvmWHgtIrYM3USXJ63mUOXthhq wBCqrWPCmR2dloXXx0b6fB8Rc/FIEd5mwF7/9cJxiRtREv8jI0 e2EHFcZIlyTgYvIJMFlALr+UMJbH6bJ17wMyXJa4vJiuQXF9yx AOXBGcUEGCsSm70dfUzWbyn0RIDMLjOywUt+ZvUTZy+H6gI3Hh S3ODNglIchogw== X-Gm-Message-State: ALoCoQmOvc0vctkEz84Rquku7NTTunZ2Zz8ZC49DkUKsXBWeaQU8uXb6q6H4ZvfmYsouIcpVBXxJ The atmel_nand driver was broken by b654a9a46fc2 "mtd: atmel nand: fix gpio missing request". This is a rather helpless attempt to fix this, probably messing up the error handling even further but getting the build to work again, so please treat it as a bug report rather than a fix to be applied. Without this patch, building any at91 configuration results in: drivers/mtd/nand/atmel_nand.c: In function 'atmel_nand_probe': drivers/mtd/nand/atmel_nand.c:1451:4: error: label 'err_ecc_ioremap' used but not defined Signed-off-by: Arnd Bergmann Cc: Jean-Christophe PLAGNIOL-VILLARD Cc: Artem Bityutskiy --- drivers/mtd/nand/atmel_nand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 9144557..eba5b2a 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1420,7 +1420,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can't request rdy gpio %d\n", host->board.rdy_pin); - goto err_ecc_ioremap; + goto err_no_card; } res = gpio_direction_input(host->board.rdy_pin); @@ -1428,7 +1428,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can't request input direction rdy gpio %d\n", host->board.rdy_pin); - goto err_ecc_ioremap; + goto err_no_card; } nand_chip->dev_ready = atmel_nand_device_ready; @@ -1440,7 +1440,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can't request enable gpio %d\n", host->board.enable_pin); - goto err_ecc_ioremap; + goto err_no_card; } res = gpio_direction_output(host->board.enable_pin, 1); @@ -1448,7 +1448,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can't request output direction enable gpio %d\n", host->board.enable_pin); - goto err_ecc_ioremap; + goto err_no_card; } }