Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754879Ab3GJP7a (ORCPT ); Wed, 10 Jul 2013 11:59:30 -0400 Received: from sauhun.de ([89.238.76.85]:44314 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754522Ab3GJP70 (ORCPT ); Wed, 10 Jul 2013 11:59:26 -0400 From: Wolfram Sang To: linux-kernel@vger.kernel.org Cc: Wolfram Sang , David Woodhouse , Artem Bityutskiy , Josh Wu , Jean-Christophe PLAGNIOL-VILLARD , Linus Walleij , linux-mtd@lists.infradead.org Subject: [PATCH 05/12] drivers/mtd/nand: don't use devm_pinctrl_get_select_default() in probe Date: Wed, 10 Jul 2013 16:57:40 +0100 Message-Id: <1373471889-18107-5-git-send-email-wsa@the-dreams.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1373471889-18107-1-git-send-email-wsa@the-dreams.de> References: <1373471889-18107-1-git-send-email-wsa@the-dreams.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1722 Lines: 51 Since commit ab78029 (drivers/pinctrl: grab default handles from device core), we can rely on device core for setting the default pins. Compile tested only. Acked-by: Linus Walleij (personally at LCE13) Signed-off-by: Wolfram Sang --- drivers/mtd/nand/atmel_nand.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 2d23d29..4653b64a 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -41,7 +41,6 @@ #include #include #include -#include #include @@ -1470,7 +1469,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev) struct resource *mem; struct mtd_part_parser_data ppdata = {}; int res; - struct pinctrl *pinctrl; mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!mem) { @@ -1515,13 +1513,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev) nand_chip->IO_ADDR_W = host->io_base; nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl; - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - dev_err(host->dev, "Failed to request pinctrl\n"); - res = PTR_ERR(pinctrl); - goto err_ecc_ioremap; - } - if (gpio_is_valid(host->board.rdy_pin)) { res = gpio_request(host->board.rdy_pin, "nand_rdy"); if (res < 0) { -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/