From patchwork Mon May 6 18:05:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 2524811 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 50E0B3FC5A for ; Mon, 6 May 2013 18:06:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753336Ab3EFSGc (ORCPT ); Mon, 6 May 2013 14:06:32 -0400 Received: from va3ehsobe005.messaging.microsoft.com ([216.32.180.31]:45632 "EHLO va3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754278Ab3EFSGa (ORCPT ); Mon, 6 May 2013 14:06:30 -0400 Received: from mail122-va3-R.bigfish.com (10.7.14.240) by VA3EHSOBE001.bigfish.com (10.7.40.21) with Microsoft SMTP Server id 14.1.225.23; Mon, 6 May 2013 18:06:29 +0000 Received: from mail122-va3 (localhost [127.0.0.1]) by mail122-va3-R.bigfish.com (Postfix) with ESMTP id 3B81F440173; Mon, 6 May 2013 18:06:29 +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 mail122-va3 (localhost.localdomain [127.0.0.1]) by mail122-va3 (MessageSwitch) id 1367863586778348_28260; Mon, 6 May 2013 18:06:26 +0000 (UTC) Received: from VA3EHSMHS021.bigfish.com (unknown [10.7.14.238]) by mail122-va3.bigfish.com (Postfix) with ESMTP id B99FA480075; Mon, 6 May 2013 18:06:26 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS021.bigfish.com (10.7.99.31) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 6 May 2013 18:06:26 +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:27 +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 r46I6Hv9019624; Mon, 6 May 2013 11:06:24 -0700 From: Fabio Estevam To: CC: , , Fabio Estevam , Chris Ball , Subject: [PATCH 04/13] mmc: mxs-mmc: Let device core handle pinctrl Date: Mon, 6 May 2013 15:05:52 -0300 Message-ID: <1367863561-11534-4-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-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@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: Chris Ball Cc: Signed-off-by: Fabio Estevam --- drivers/mmc/host/mxs-mmc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 4efe302..2f64e5a 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include @@ -592,7 +591,6 @@ static int mxs_mmc_probe(struct platform_device *pdev) struct mxs_mmc_host *host; struct mmc_host *mmc; struct resource *iores, *dmares; - struct pinctrl *pinctrl; int ret = 0, irq_err, irq_dma; dma_cap_mask_t mask; struct regulator *reg_vmmc; @@ -651,12 +649,6 @@ static int mxs_mmc_probe(struct platform_device *pdev) } } - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - ret = PTR_ERR(pinctrl); - goto out_mmc_free; - } - ssp->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(ssp->clk)) { ret = PTR_ERR(ssp->clk);