From patchwork Mon May 6 18:05:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 241745 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DA22A2C00F6 for ; Tue, 7 May 2013 04:06:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754236Ab3EFSG1 (ORCPT ); Mon, 6 May 2013 14:06:27 -0400 Received: from va3ehsobe003.messaging.microsoft.com ([216.32.180.13]:7989 "EHLO va3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754046Ab3EFSG0 (ORCPT ); Mon, 6 May 2013 14:06:26 -0400 Received: from mail19-va3-R.bigfish.com (10.7.14.244) by VA3EHSOBE012.bigfish.com (10.7.40.62) with Microsoft SMTP Server id 14.1.225.23; Mon, 6 May 2013 18:06:25 +0000 Received: from mail19-va3 (localhost [127.0.0.1]) by mail19-va3-R.bigfish.com (Postfix) with ESMTP id 79282120454; Mon, 6 May 2013 18:06:25 +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(z329eqzzz1f42h1fc6h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ahzz8275bh8275dhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1155h) Received: from mail19-va3 (localhost.localdomain [127.0.0.1]) by mail19-va3 (MessageSwitch) id 1367863582945333_18558; Mon, 6 May 2013 18:06:22 +0000 (UTC) Received: from VA3EHSMHS026.bigfish.com (unknown [10.7.14.248]) by mail19-va3.bigfish.com (Postfix) with ESMTP id E0D1F4E00EC; Mon, 6 May 2013 18:06:22 +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:22 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.2.328.11; Mon, 6 May 2013 18:06:24 +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 r46I6Hv7019624; Mon, 6 May 2013 11:06:20 -0700 From: Fabio Estevam To: CC: , , Fabio Estevam , Wolfram Sang , Subject: [PATCH 02/13] i2c: i2c-imx: Let device core handle pinctrl Date: Mon, 6 May 2013 15:05:50 -0300 Message-ID: <1367863561-11534-2-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 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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: Wolfram Sang Cc: Signed-off-by: Fabio Estevam --- drivers/i2c/busses/i2c-imx.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 82f20c6..8c7526c 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -51,7 +51,6 @@ #include #include #include -#include #include /** Defines ******************************************************************** @@ -493,7 +492,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev) struct imx_i2c_struct *i2c_imx; struct resource *res; struct imxi2c_platform_data *pdata = pdev->dev.platform_data; - struct pinctrl *pinctrl; void __iomem *base; int irq, ret; u32 bitrate; @@ -535,12 +533,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev) i2c_imx->adapter.dev.of_node = pdev->dev.of_node; i2c_imx->base = base; - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - dev_err(&pdev->dev, "can't get/select pinctrl\n"); - return PTR_ERR(pinctrl); - } - /* Get I2C clock */ i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(i2c_imx->clk)) {