From patchwork Mon May 6 18:05:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 2524821 Return-Path: X-Original-To: patchwork-spi-devel-general@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by patchwork2.kernel.org (Postfix) with ESMTP id B05D9DF230 for ; Mon, 6 May 2013 18:06:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1UZPoH-0002rc-Ud; Mon, 06 May 2013 18:06:49 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1UZPoG-0002rW-Gd for spi-devel-general@lists.sourceforge.net; Mon, 06 May 2013 18:06:48 +0000 X-ACL-Warn: Received: from va3ehsobe002.messaging.microsoft.com ([216.32.180.12] helo=va3outboundpool.messaging.microsoft.com) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:AES128-SHA:128) (Exim 4.76) id 1UZPoC-0000pM-QY for spi-devel-general@lists.sourceforge.net; Mon, 06 May 2013 18:06:48 +0000 Received: from mail99-va3-R.bigfish.com (10.7.14.246) by VA3EHSOBE013.bigfish.com (10.7.40.63) with Microsoft SMTP Server id 14.1.225.23; Mon, 6 May 2013 18:06:37 +0000 Received: from mail99-va3 (localhost [127.0.0.1]) by mail99-va3-R.bigfish.com (Postfix) with ESMTP id 3D73A20742; Mon, 6 May 2013 18:06:37 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 9 X-BigFish: VS9(z329eqzzz1f42h1fc6h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ahzz8275bh8275dh8275chz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1155h) Received: from mail99-va3 (localhost.localdomain [127.0.0.1]) by mail99-va3 (MessageSwitch) id 1367863595312946_7616; Mon, 6 May 2013 18:06:35 +0000 (UTC) Received: from VA3EHSMHS026.bigfish.com (unknown [10.7.14.246]) by mail99-va3.bigfish.com (Postfix) with ESMTP id 3E03C2C0058; Mon, 6 May 2013 18:06:35 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS026.bigfish.com (10.7.99.36) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 6 May 2013 18:06:35 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-005.039d.mgd.msft.net (10.84.1.17) with Microsoft SMTP Server (TLS) id 14.2.328.11; Mon, 6 May 2013 18:06:36 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.244.102]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r46I6HvC019624; Mon, 6 May 2013 11:06:30 -0700 From: Fabio Estevam To: Subject: [PATCH 07/13] spi: spi-imx: Let device core handle pinctrl Date: Mon, 6 May 2013 15:05:55 -0300 Message-ID: <1367863561-11534-7-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1367863561-11534-1-git-send-email-fabio.estevam@freescale.com> References: <1367863561-11534-1-git-send-email-fabio.estevam@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-Spam-Score: 0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. X-Headers-End: 1UZPoC-0000pM-QY Cc: Fabio Estevam , Mark Brown , kernel@pengutronix.de, spi-devel-general@lists.sourceforge.net, festevam@gmail.com X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spi-devel-general-bounces@lists.sourceforge.net Since commit ab78029 (drivers/pinctrl: grab default handles from device core), we can rely on device core for handling pinctrl. So remove devm_pinctrl_get_select_default() from the driver. Cc: Mark Brown Cc: Grant Likely Cc: Signed-off-by: Fabio Estevam --- drivers/spi/spi-imx.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 0befeeb..9821ef1 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -37,7 +37,6 @@ #include #include #include -#include #include @@ -760,7 +759,6 @@ static int spi_imx_probe(struct platform_device *pdev) struct spi_master *master; struct spi_imx_data *spi_imx; struct resource *res; - struct pinctrl *pinctrl; int i, ret, num_cs; if (!np && !mxc_platform_info) { @@ -848,12 +846,6 @@ static int spi_imx_probe(struct platform_device *pdev) goto out_iounmap; } - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - ret = PTR_ERR(pinctrl); - goto out_free_irq; - } - spi_imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); if (IS_ERR(spi_imx->clk_ipg)) { ret = PTR_ERR(spi_imx->clk_ipg);