From patchwork Wed Jul 10 15:57:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 258154 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B3C102C009D for ; Thu, 11 Jul 2013 02:01:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754755Ab3GJP7l (ORCPT ); Wed, 10 Jul 2013 11:59:41 -0400 Received: from sauhun.de ([89.238.76.85]:44339 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754056Ab3GJP7j (ORCPT ); Wed, 10 Jul 2013 11:59:39 -0400 Received: from [193.120.41.118] (port=49159 helo=localhost) by pokefinder.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1Uwwnq-0006tQ-FQ; Wed, 10 Jul 2013 17:59:38 +0200 From: Wolfram Sang To: linux-kernel@vger.kernel.org Cc: Wolfram Sang , Wolfgang Grandegger , Marc Kleine-Budde , AnilKumar Ch , "David S. Miller" , Tony Lindgren , Jingoo Han , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 07/12] drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe Date: Wed, 10 Jul 2013 16:57:42 +0100 Message-Id: <1373471889-18107-7-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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Marc Kleine-Budde --- drivers/net/can/c_can/c_can_platform.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index b918c73..c6f838d 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c @@ -32,7 +32,6 @@ #include #include #include -#include #include @@ -114,7 +113,6 @@ static int c_can_plat_probe(struct platform_device *pdev) struct c_can_priv *priv; const struct of_device_id *match; const struct platform_device_id *id; - struct pinctrl *pinctrl; struct resource *mem, *res; int irq; struct clk *clk; @@ -131,11 +129,6 @@ static int c_can_plat_probe(struct platform_device *pdev) id = platform_get_device_id(pdev); } - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) - dev_warn(&pdev->dev, - "failed to configure pins from driver\n"); - /* get the appropriate clk */ clk = clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) {